merge trunk to release

[SVN r86723]
merge trunk to release

[SVN r86724]
merge trunk to release

[SVN r86727]