commit #738