Generic improvements

See merge request !169
49 jobs for generic_improvements
in 0 seconds, using 0 compute credits, and was queued for 0 seconds