metadata fixes
Merge branch 'master', remote-tracking branch 'origin' into 2.0.x