Import registry from SVN 25146