fix unmasking - not taken placeholders equal to the value into account
Merge branch '1.x' into 2.x