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