Revert "Merge branch 'bug/swap' into 'master'"
Revert "Merge branch 'bug/swap' into 'master'"

This reverts merge request !94
CMGS/core,projecteru2/core,projecteru2/core,CMGS/core,CMGS/core,projecteru2/core