optimize the replacement
...
Merge branch 'master'