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