commit #608