Merge commit 'upstream/2008.1+svn1648'