Merged in feature/backport-gitlab (pull request #403)
Lots of cherry-picking, very probable I’ve missed something.
Lots of cherry-picking, very probable I’ve missed something.