3.7.2/3.7.3 changes (untested)