Merge "Sync with upstream 2ccadef (svn revision 360428):"