commit #691