Merge branch 'refactor-flint-filters' into 'master'

Filter: Refactor flint filters

See merge request !4674
10 jobs for master in 111 minutes and 25 seconds (queued for 2 seconds)