v8.2 Code Freeze 3