Fixes from Petr on rebased PR 422
merge dev_4_4 -D org -I include -E exclude: PR 368 (Cpp: Correct content and markup)
merge dev_4_4 -D org -I include -E exclude: PR 423 (Fixes from Petr)