Merge branch 'rl-fix' into 'ba-baumann-clone'

Rl fix

See merge request !73
6 jobs for ba-baumann-clone in 5 minutes and 50 seconds