Merge change 6636

* changes:
  Implemented the metadata changed notification filters.