merge develop -D org -I include -E exclude: PR 521 (Assorted bug fixes for May)