Fixed string masking
Merged