PERF: Use shallow swap over deep assignment

Change-Id: I4e97a73e11bef028e6a1e5ed7aed423c69d7a344
Merge topic 'AddingMoreSwapMethods'

bf878a1c PERF: Use shallow swap over deep assignment