Dude, if you really need finish your project, make some backups and join the Quixel facebook and get 2.1.6 test, it really works great after quite a bit of testing. I almost thought i encountered a masking bug, but thank the gods it was good old, lovely, god-did-i-miss-its-soft-carress, user error.