Merge branch 'hotfix/5a72a485' into develop

.gitlab-ci.yml not found in this commit