PIM-3201: Fix for PR