Merge branch 'cc/replace-with-the-same-type'