Merge "Statistics manager context map holder change"