Merge remote-tracking branch 'rob/CRM-16367-46' into CRM-16367