gkistanova requested changes to this revision. gkistanova added a comment. This revision now requires changes to proceed. This seems like 2 unrelated changes. Could you split it to 2 different items, please? https://reviews.llvm.org/D38011