merge develop -D org -I include -E exclude: PR 309 (Walkthrough fixes (rebased onto develop))