Merge branch 'ff/swap'