PIM-3415: fix for PR