Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev