[stable25] polishing 'n cleaning code#118

ArtificialOwl merged 4 commits intostable25nextcloud/related_resources:stable25from

backport/111/stable25nextcloud/related_resources:backport/111/stable25Copy head branch name to clipboard