Merge branch 'mk/maint-apply-swap' into maint