Merge branch 'mullerfa/fixes' into 'main'

Inherit before_script from .test-job-linux

See merge request !1492