Commit after starter milestone 19