[backportbot]

Backport of #8359

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

• Review and resolve any conflicts
• Review and verify the backported changes
• Amend HEAD commit to remove the line stating to skip CI

---

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

[github-actions]

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 87587 was 83517 (+4.87%)
Please check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.

[grnd-alt]

/backport to stable32 please

[backportbot]

The backport to stable32 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable32
git pull origin stable32

# Create the new backport branch
git checkout -b backport/8392/stable32

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3ea51c91 66ee9688

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/8392/stable32

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/8392/stable32."} - https://docs.github.com/rest/pulls/pulls#create-a-pull-request

---

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

[grnd-alt]

/backport to stable31