PIM-3187 from 1.2