Cherry pick Feat: Boost Support for Vault Swaps to release branch

Cherry pick Feat: Boost Support for Vault Swaps to release branch #682