Merge remote-tracking branch 'origin/master' into metadatafix
Merge branch 'metadatafix'
Added todo
Updated release notes