Merge "Statistics context and manager changes"