Merge in the ongoing changes in the origin branch