- [x] https://github.com/nextcloud/server/pull/38854 - [x] https://github.com/nextcloud/server/pull/39567 - [x] https://github.com/nextcloud/server/pull/39684 - [x] tests fix from https://github.com/nextcloud/server/pull/39660 - [x] https://github.com/nextcloud/server/pull/39680
