Backport issue 10764
Merge pull request #10884 from owncloud/stable7_backport_issue_10674

Backport issue 10764