Merge branch 'mk/apply-swap'