(cherry picked from commit 876082ea2f)
# Conflicts:
# erpnext/projects/doctype/projects_settings/projects_settings.json
(cherry picked from commit 876082ea2f)
# Conflicts:
# erpnext/projects/doctype/projects_settings/projects_settings.json