nextcloud: Another round of fixes and improvements
This is built on top of the previous merge request !2469 (closed). So that one should be merged first.
This is built on top of the previous merge request !2469 (closed). So that one should be merged first.