-- CRM-13417 changes as per comment