Merge PIM-2345 from 1.2