(cherry picked from commit c68c70f8bc)
# Conflicts:
# erpnext/loan_management/doctype/loan/loan.json
# erpnext/patches.txt
(cherry picked from commit c68c70f8bc)
# Conflicts:
# erpnext/loan_management/doctype/loan/loan.json
# erpnext/patches.txt