Manual merge of GitLab MR !1