Merge branch 'fix/fake-filters' into 'develop'