getting expression filter test case running again
merging origin/master