Merge "GlobalFunctions: Deprecate swap()"