merge master -D org -I include -E exclude: PR 128 (scc rebase: bug fix and improvements)