Backport of#1943

christianlupus merged 2 commits intomain-0.10.xnextcloud/cookbook:main-0.10.xfrom

backport-main-0.10.x/masternextcloud/cookbook:backport-main-0.10.x/masterCopy head branch name to clipboard