Merge branch 'cycles-uploads' into 'develop'

Recompilation speedup: use generic types in @spec in Upload.Filter

See merge request !3453
16 jobs for develop in 86 minutes and 19 seconds (queued for 6 seconds)