Minor tweaks after metadata review
Merge remote branch 'origin/master'