merge develop -D org -I include -E exclude: PR 505 (Add MetadataRoot to MetadataStore getRoot/setRoot interfaces)
merge develop -D org -I include -E exclude: PR 521 (Assorted bug fixes for May)