r3773: more low-risk or critical changes from 3.0