Merge pull request #2602 from pratik-joshi/CRM-13964-qa