Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)."