Intermediate commit, ready to merge to the master.