commit #765