Adjust MetadataExtension addresses #221, #228 and #230
Merge branch 'hotfix-0.8.2'