merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 262 (Training develop)