Merge branch 'merge-return-values' into 'ci-test'

Merge return values

See merge request !12
5 jobs for ci-test in 1 minute and 49 seconds (queued for 3 seconds)