commit #694