Adds support for server-side filtering of data types supported by ATS.
Rebase on dev
Renamed class to match convention