Merge branch 'cc/maint-diff-CC-binary' into maint