commit #698