Backport of !11 (merged)
assigned to @daissi
enabled an automatic merge when all merge checks for e754bab1 pass
marked this merge request as ready
merged