Merge branch 'erratic-filter-test' into 'develop'

FilterTest: tag erratic test

See merge request !3613
19 jobs for develop in 97 minutes and 8 seconds (queued for 4 seconds)