merge develop -D org -I include -E exclude: PR 365 (fix #10870: describe FS upload configuration)
merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)