S74225 commit all the things while it works