1.7.2 Backport fixes from 1.7.10 (3.0.6 update)

After a messy git merge, had to update 1.7.2 manually. Will update OC
next.