Merge branch 'jk/maint-apply-no-binary' into maint