merged rev. 84642-85778

[SVN r85820]
merged rev. 85821

[SVN r85825]