restrict cosmetic replacements
Merge remote-tracking branch 'origin/master'
restrict cosmetic replacements