minor changes to mdserver
Merge commit '0ddf425c36f96e36e06679227aff7cf7a1de699f'