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