v8.2 Code Freeze 4

This should be the last change, pending any bugs. More freeze
discipline required!