Merge "Sync with upstream ffa3961 (svn revision 360359):"