merge develop -D org -I include -E exclude: PR 333 (Fix readme (see #10687) (rebased onto develop))