merge develop -D org -I include -E exclude: PR 360 (9538 develop)