DOCS forward port of new docs into 4.0 (master)