Commit after starter milestone 20