Merge "Fixed the ability to filter by multiple class/methods combinations" into lmp-dev