merge develop -D org -I include -E exclude: PR 520 (fixing public user documentation)
merge develop -D org -I include -E exclude: PR 522 (Cpp: Document cmake build system)