Syncing latest bugfixes to 1.7.2