safe commit for v9.9.1