Merge "CM Data Subscriptions PoC/Performance test fixes"