Merge branch 'cc/replace' into jch