manual merge of MR 57645 from master
manual merge of MR !57645 (merged) from master
Edited by Christos Anastopoulos
GitLab jobs artifacts no longer stored forever as of Monday, November 4th 08:30h. Further information under https://cern.ch/otg0152576
manual merge of MR !57645 (merged) from master