CRM-15242 - Resubmit PR #4103