merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 252 (Developer doc tidying 2 rebased)