Merge branch 'sk/test-cmp-bin' into maint