(cherry picked from commit 0be737914a7aaf70a55415419e31c0356b402d96) # Conflicts: # crm/fcrm/doctype/crm_deal/crm_deal.json