Merge "toolbox: swap utils"