On-going of fixing compile time errors after actually migrating to 1.7.2