Merged with SVN rev 1813 from CN1 trunk
Merged es2 with master