commit #690