Merge remote-tracking branch 'rbrito/swap-dimensions'