initial import from SVN rev 456