Merge branch 'PIM-3312-stable' into PIM-3312