PIM-3054: fix for PR