Merge branch 'release/5.23.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 20 May 2021 15:09:28 +0000 (17:09 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 20 May 2021 15:09:28 +0000 (17:09 +0200)

Trivial merge