Merge branch 'mk/maint-apply-swap'