Merge pull request #6027 from neheb/apple
authorJo-Philipp Wich <jo@mein.io>
Sat, 15 Oct 2022 12:13:17 +0000 (14:13 +0200)
committerGitHub <noreply@github.com>
Sat, 15 Oct 2022 12:13:17 +0000 (14:13 +0200)
[22.03]backport iOS changes from master


Trivial merge