Changes done in the MR 476 cherry-picked into master.

#issue 134

See merge request !476 (merged)

(cherry picked from commit 31529ec2)

enabled an automatic merge when the pipeline for 9f6e71a4 succeeds

merged

mentioned in commit 4df4ace7