Added the filter callback.
Merge branch 'remove-callback-restriction'

* remove-callback-restriction:
  Added the filter callback.