Sizeable commit, including a number of large changes