Merge pull request #3400 from nextcloud/bugfix/variousFixes
authorMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 11 Aug 2021 20:16:56 +0000 (22:16 +0200)
committerGitHub <noreply@github.com>
Wed, 11 Aug 2021 20:16:56 +0000 (22:16 +0200)
Bugfix/various fixes


Trivial merge