Merged upstream in so as to allow additional filters to be used in the Services Framework.