Merge "ART: Add klass filter support"