Merge branch 'rs/swap'