Merge change 8576

* changes:
  Implementing compatibility mode for contact filtering