Merge change 6812

* changes:
  Implemented the tracking of the metadata updates.