Commit #370