Merge branch 'katzj/swap'