Merge changes I03f744b2,I154eb05b

* changes:
  remove dead code from FilterTests
  add filter delay hint default implementation