Added changes listed in CMVC appendix A.5.2; not yet tested
Added changes listed in CMVC appendix A.5.2; not yet tested


ioam/svn-history,ioam/svn-history,ioam/svn-history,ioam/svn-history,ioam/svn-history