Merge branch 'main' into task-192

This reverts commit 8a9d552760.

data/example.json

@@ -4,18 +4,21 @@
 			"id": 1,
 			"name": "alice",
 			"email_address": "alice@example.org",
+			"dav_token": null,
 			"password": "alice"
 		},
 		{
 			"id": 2,
 			"name": "bob",
 			"email_address": "bob@example.org",
+			"dav_token": "bob_dav",
 			"password": "bob"
 		},
 		{
 			"id": 3,
 			"name": "charlie",
 			"email_address": "charlie@example.org",
+			"dav_token": null,
 			"password": "charlie"
 		}
 	],