Merge "Fix treatment of suite() and class filters"