Merge pull request #2735 from pratik-joshi/CRM-13992_temp_fix