NH-2861 - Basic support for filters with joins
NH-2861 - Fix failing tests
Merge branch 'icambron-NH-2861'