Import registry from SVN 26007
Import registry from SVN 26622