Merge branch 'cc/replace-no-replace'