Merge change 7954

* changes:
  Added native metadata support.