Merged with SVN rev 1813 from CN1 trunk