Fixed rest/metadata config dependency and impacted unit test
Merge remote-tracking branch 'origin/master' into dev-nmalik