Fork from SVN r671