Merged upstream GitLab Shell 13.22.1
(draft because we need to see how it behaves with a version of the Rails app merged with GitLab 14.5)
Edited by Georges Racinet
(draft because we need to see how it behaves with a version of the Rails app merged with GitLab 14.5)