Moved everything for 1.7.2