commit #604