DOC-1790 ECMS Reference guide 3.0: Review patch from DOC-1673