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