Merge in any other 1.7 changes