Commit after starter milestone 18