Merge pull request #4647 from aajanki/hds_metadata