merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 383 (Updating User index page & demo server for FS)
merge develop -D org -I include -E exclude: PR 385 (Add doc regarding FS server migration (see #10964).)