commit #611