- minor change to metadataserver
- merge