Latest perf fix for CMS based on 3.11.3

Contains all fixes from 3.11.7 + pert fixes merged into the develop that we faced on the testing.
Full Changelog: v3.11.7...v3.11.8