commit #610