v13 port because otherwise backports will result in conflicts always
(cherry picked from commit 508832e90a) # Conflicts: # erpnext/patches.txt
508832e90a