Merge branch 'cp/merge-continue'