Pull latest code from upstream, SVN change #216042