Merge branch 'PIM-3282-stable' into PIM-3282