commit #695