Initial commit for 1.7.2 changes

There will probably be some changes to this