Merge branch 'cc/replace'