r6080: Port some of the non-critical changes from HEAD to 3_0. The main one is the