commit #537