merge develop -D org -I include -E exclude: PR 23 (Kymograph 8206_develop)
merge develop -D org -I include -E exclude: PR 25 (Combine imgs 9747 develop)