merge develop -D org -I include -E exclude: PR 302 (Addressing ticket 10531 & fixing random typo (rebased onto develop))