diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.result b/testing/tests/regression-suite/000-Setup-PUT-collection.result
index ce1fdbd6..df9ee408 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection.result
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection.result
@@ -16,8 +16,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 DTSTART;TZID=Pacific/Auckland:20081020T110000
 DTEND;TZID=Pacific/Auckland:20081020T113000
 X-MOZ-GENERATION:2
@@ -53,9 +53,9 @@ END:VCALENDAR
       logged_user: >1<
  percent_complete: >NULL<
          priority: >NULL<
-            rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR<
+            rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR<
            status: >NULL<
-          summary: >Daily Action Meeting<
+          summary: >Near Daily Action Meeting<
            transp: >NULL<
             tz_id: >Pacific/Auckland<
               uid: >33169d69-2969-4a96-a3e1-2e312b7614e6<
@@ -242,5 +242,76 @@ END:VCALENDAR
               url: >NULL<
           user_no: >11<
 
-            count: >4<
+   A1 CalDAV DATA: >BEGIN:VCALENDAR
+PRODID:-//davical.org//NONSGML AWL Calendar//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+LAST-MODIFIED:20081123T210725Z
+SEQUENCE:6
+UID:bd262d20-1cdb-012d-1264-002421a2359e
+SUMMARY:Afternoon run
+DESCRIPTION:
+DTSTART;TZID=America/Los_Angeles:20081123T150000
+CREATED:20081123T210644Z
+DTSTAMP:20081123T210725Z
+DURATION:PT1H
+LOCATION:
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:America/Los_Angeles
+X-TZINFO:America/Los_Angeles[2007g/Partial@883612800000]
+BEGIN:DAYLIGHT
+TZOFFSETTO:-0700
+TZOFFSETFROM:-0800
+TZNAME:America/Los_Angeles(DST)
+DTSTART:19980405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060403T100000Z;BYMONTH=4;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:-0800
+TZOFFSETFROM:-0700
+TZNAME:America/Los_Angeles(STD)
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061030T100000Z;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:-0700
+TZOFFSETFROM:-0800
+TZNAME:America/Los_Angeles(DST)
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:-0800
+TZOFFSETFROM:-0700
+TZNAME:America/Los_Angeles(STD)
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+      description: ><
+            dtend: >2008-11-23 16:00:00<
+          dtstamp: >2008-11-23 21:07:25<
+          dtstart: >2008-11-23 15:00:00<
+              due: >NULL<
+         location: ><
+      logged_user: >1<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >FREQ=WEEKLY;INTERVAL=1;BYDAY=SU<
+           status: >NULL<
+          summary: >Afternoon run<
+           transp: >NULL<
+            tz_id: >America/Los_Angeles<
+              uid: >bd262d20-1cdb-012d-1264-002421a2359e<
+              url: >NULL<
+          user_no: >11<
+
+            count: >5<
 
diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.test b/testing/tests/regression-suite/000-Setup-PUT-collection.test
index fb11b381..82afc1b9 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection.test
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection.test
@@ -16,6 +16,7 @@ BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
 X-WR-CALNAME:User 2's Calendar, as uploaded by Admin
 VERSION:2.0
+
 BEGIN:VTIMEZONE
 TZID:Pacific/Auckland
 X-LIC-LOCATION:Pacific/Auckland
@@ -34,17 +35,19 @@ DTSTART:19700405T030000
 RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
 END:STANDARD
 END:VTIMEZONE
+
 BEGIN:VEVENT
 CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 DTSTART;TZID=Pacific/Auckland:20081020T110000
 DTEND;TZID=Pacific/Auckland:20081020T113000
 X-MOZ-GENERATION:2
 END:VEVENT
+
 BEGIN:VEVENT
 CREATED:20081023T054934Z
 LAST-MODIFIED:20081023T055059Z
@@ -56,6 +59,7 @@ DTSTART;TZID=Pacific/Auckland:20081020T090000
 DTEND;TZID=Pacific/Auckland:20081020T100000
 X-MOZ-GENERATION:2
 END:VEVENT
+
 BEGIN:VEVENT
 CREATED:20081023T055115Z
 LAST-MODIFIED:20081023T055139Z
@@ -67,6 +71,7 @@ DTSTART;TZID=Pacific/Auckland:20081024T140000
 DTEND;TZID=Pacific/Auckland:20081024T150000
 X-MOZ-GENERATION:2
 END:VEVENT
+
 BEGIN:VEVENT
 LAST-MODIFIED:20080303T015422Z
 SEQUENCE:5
@@ -79,6 +84,21 @@ CREATED:20080303T015329Z
 DTSTAMP:20080303T015422Z
 DURATION:P1D
 END:VEVENT
+
+BEGIN:VEVENT
+LAST-MODIFIED:20081123T210725Z
+SEQUENCE:6
+UID:bd262d20-1cdb-012d-1264-002421a2359e
+SUMMARY:Afternoon run
+DESCRIPTION:
+DTSTART;TZID=America/Los_Angeles:20081123T150000
+CREATED:20081123T210644Z
+DTSTAMP:20081123T210725Z
+DURATION:PT1H
+LOCATION:
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
+END:VEVENT
+
 BEGIN:VTIMEZONE
 TZID:America/Los_Angeles
 X-TZINFO:America/Los_Angeles[2007g/Partial@883612800000]
@@ -112,7 +132,6 @@ RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
-
 ENDDATA
 
 QUERY
diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result
index 06d55356..bf3308fa 100644
--- a/testing/tests/regression-suite/244-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/244-Moz-POST-FB.result
@@ -18,17 +18,12 @@ UID:c5bd82ea-cd89-4f58-8d31-336f47e44f97
 ORGANIZER:mailto:user1@example.net
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: 
  mailto:user2@example.net
-FREEBUSY;FBTYPE=BUSY:20081020T090000Z/20081020T093000Z
 FREEBUSY;FBTYPE=BUSY:20081021T090000Z/20081021T093000Z
-FREEBUSY;FBTYPE=BUSY:20081022T090000Z/20081022T093000Z
 FREEBUSY;FBTYPE=BUSY:20081023T090000Z/20081023T093000Z
 FREEBUSY;FBTYPE=BUSY:20081027T090000Z/20081027T093000Z
-FREEBUSY;FBTYPE=BUSY:20081028T090000Z/20081028T093000Z
 FREEBUSY;FBTYPE=BUSY:20081029T090000Z/20081029T093000Z
-FREEBUSY;FBTYPE=BUSY:20081030T090000Z/20081030T093000Z
 FREEBUSY;FBTYPE=BUSY:20081031T090000Z/20081031T093000Z
 FREEBUSY;FBTYPE=BUSY:20081103T090000Z/20081103T093000Z
-FREEBUSY;FBTYPE=BUSY:20081104T090000Z/20081104T093000Z
 FREEBUSY;FBTYPE=BUSY:20081026T070000Z/20081026T080000Z
 FREEBUSY;FBTYPE=BUSY:20081102T070000Z/20081102T080000Z
 FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z
diff --git a/testing/tests/regression-suite/516-iCal-POST.result b/testing/tests/regression-suite/516-iCal-POST.result
index de4417dd..2e6802a5 100644
--- a/testing/tests/regression-suite/516-iCal-POST.result
+++ b/testing/tests/regression-suite/516-iCal-POST.result
@@ -17,7 +17,6 @@ DTEND:20081024T083000Z
 UID:89E43E7F-911D-4052-9FE3-4782268649E0
 ORGANIZER:mailto:user1@example.net
 X-WR-ATTENDEE:mailto:user2@example.net
-FREEBUSY;FBTYPE=BUSY:20081022T090000Z/20081022T093000Z
 FREEBUSY;FBTYPE=BUSY:20081023T090000Z/20081023T093000Z
 FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z
 END:VFREEBUSY
diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result
index 54b2ca20..f90a6213 100644
--- a/testing/tests/regression-suite/522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "5f55345b7391a7d0c9e0a5bf3b8620f9"
+ETag: "3fc727f4d41e43e47c6a189b1e0258e4"
 Content-Length: 3932
 Content-Type: text/xml; charset="utf-8"
 
@@ -36,7 +36,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user2/home/</href>
   <propstat>
    <prop>
-    <C:getctag>"f7543943a7a982f19306b3201d575fbc"</C:getctag>
+    <C:getctag>"a3dcf395e9cdb84203c8491e1a1d99cc"</C:getctag>
     <displayname>User 2's Calendar, as uploaded by Admin</displayname>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/871-PROPFIND.result b/testing/tests/regression-suite/871-PROPFIND.result
index 82f8fba1..5718f0e4 100644
--- a/testing/tests/regression-suite/871-PROPFIND.result
+++ b/testing/tests/regression-suite/871-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "d020f04d95bacdf8a150f2b06a3c0dcc"
+ETag: "5a27c5837af93fae40df868c04319afe"
 Content-Length: 522
 Content-Type: text/xml; charset="utf-8"
 
@@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>User 2's Calendar, as uploaded by Admin</displayname>
-    <C:getctag>"f7543943a7a982f19306b3201d575fbc"</C:getctag>
+    <C:getctag>"a3dcf395e9cdb84203c8491e1a1d99cc"</C:getctag>
     <resourcetype>
      <collection/>
      <C1:calendar/>
diff --git a/testing/tests/regression-suite/872-PROPFIND.result b/testing/tests/regression-suite/872-PROPFIND.result
index 4c671f30..0645fba5 100644
--- a/testing/tests/regression-suite/872-PROPFIND.result
+++ b/testing/tests/regression-suite/872-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "022f0d6284e2773f33bde675089979d8"
-Content-Length: 2009
+ETag: "a2acaf7821539c5e1042ee118c21a3f0"
+Content-Length: 2386
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user2/home/</href>
   <propstat>
    <prop>
-    <C:getctag>"f7543943a7a982f19306b3201d575fbc"</C:getctag>
+    <C:getctag>"a3dcf395e9cdb84203c8491e1a1d99cc"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -27,7 +27,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
-    <getetag>"64d28f4f57515d6c63cec02b5d882eaa"</getetag>
+    <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -87,4 +87,20 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user2/home/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"671d4ee904be6c16dd1be076619fe7c0"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:getctag/>
+    <C1:gobbledegook/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/880-Freebusy-POST.result b/testing/tests/regression-suite/880-Freebusy-POST.result
index af427c1b..6100afc3 100644
--- a/testing/tests/regression-suite/880-Freebusy-POST.result
+++ b/testing/tests/regression-suite/880-Freebusy-POST.result
@@ -59,15 +59,11 @@ ORGANIZER:mailto:user1@example.net
 ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: 
  mailto:user2@example.net
 FREEBUSY;FBTYPE=BUSY:20081021T090000Z/20081021T093000Z
-FREEBUSY;FBTYPE=BUSY:20081022T090000Z/20081022T093000Z
 FREEBUSY;FBTYPE=BUSY:20081023T090000Z/20081023T093000Z
 FREEBUSY;FBTYPE=BUSY:20081027T090000Z/20081027T093000Z
-FREEBUSY;FBTYPE=BUSY:20081028T090000Z/20081028T093000Z
 FREEBUSY;FBTYPE=BUSY:20081029T090000Z/20081029T093000Z
-FREEBUSY;FBTYPE=BUSY:20081030T090000Z/20081030T093000Z
 FREEBUSY;FBTYPE=BUSY:20081031T090000Z/20081031T093000Z
 FREEBUSY;FBTYPE=BUSY:20081103T090000Z/20081103T093000Z
-FREEBUSY;FBTYPE=BUSY:20081104T090000Z/20081104T093000Z
 FREEBUSY;FBTYPE=BUSY:20081105T090000Z/20081105T093000Z
 FREEBUSY;FBTYPE=BUSY:20081026T070000Z/20081026T080000Z
 FREEBUSY;FBTYPE=BUSY:20081102T070000Z/20081102T080000Z
diff --git a/testing/tests/regression-suite/902-PUT-collection.result b/testing/tests/regression-suite/902-PUT-collection.result
index b4ae6024..430fcaaa 100644
--- a/testing/tests/regression-suite/902-PUT-collection.result
+++ b/testing/tests/regression-suite/902-PUT-collection.result
@@ -15,7 +15,7 @@ Content-Type: text/plain; charset="utf-8"
 
         attendees: >40<
 
-    collection_id: >1399<
+    collection_id: >1400<
   dav_displayname: >anotherone<
          dav_etag: >a52157c35d64e6051e54024625d3a94a<
          dav_name: >/user1/anotherone/<
diff --git a/testing/tests/regression-suite/924-MOVE.result b/testing/tests/regression-suite/924-MOVE.result
index 40a92f41..ca5cc5b7 100644
--- a/testing/tests/regression-suite/924-MOVE.result
+++ b/testing/tests/regression-suite/924-MOVE.result
@@ -5,9 +5,9 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-    cd_collection: >1399<
+    cd_collection: >1400<
        cd_user_no: >10<
-    ci_collection: >1399<
+    ci_collection: >1400<
        ci_user_no: >10<
         data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
         item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
diff --git a/testing/tests/regression-suite/950-MKTICKET.result b/testing/tests/regression-suite/950-MKTICKET.result
index cb42ae10..d79301ff 100644
--- a/testing/tests/regression-suite/950-MKTICKET.result
+++ b/testing/tests/regression-suite/950-MKTICKET.result
@@ -40,6 +40,6 @@ target_resource_i: >NULL<
      dav_owner_id: >3<
        privileges: >000000000001001011100111<
 target_collection: >10<
-target_resource_i: >1366<
+target_resource_i: >1367<
           timeout: >1 day<
 
diff --git a/testing/tests/regression-suite/951-MKTICKET.result b/testing/tests/regression-suite/951-MKTICKET.result
index f5f5bdd2..266a12a5 100644
--- a/testing/tests/regression-suite/951-MKTICKET.result
+++ b/testing/tests/regression-suite/951-MKTICKET.result
@@ -19,6 +19,6 @@ target_resource_i: >NULL<
      dav_owner_id: >3<
        privileges: >000000000001001011100111<
 target_collection: >10<
-target_resource_i: >1366<
+target_resource_i: >1367<
           timeout: >24:00:00<
 
diff --git a/testing/tests/regression-suite/958-PROPFIND.result b/testing/tests/regression-suite/958-PROPFIND.result
index 3b57b288..5a979ae5 100644
--- a/testing/tests/regression-suite/958-PROPFIND.result
+++ b/testing/tests/regression-suite/958-PROPFIND.result
@@ -17,7 +17,7 @@
   <href>/public.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
-    <getetag>"64d28f4f57515d6c63cec02b5d882eaa"</getetag>
+    <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -49,4 +49,13 @@
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/public.php/user2/home/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"671d4ee904be6c16dd1be076619fe7c0"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/959-REPORT-public-expanded.result b/testing/tests/regression-suite/959-REPORT-public-expanded.result
index a17adf54..2881ff5f 100644
--- a/testing/tests/regression-suite/959-REPORT-public-expanded.result
+++ b/testing/tests/regression-suite/959-REPORT-public-expanded.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "7bc9e999eca856e8d78134c2deed424f"
-Content-Length: 11656
+ETag: "bfd344d71a0713cf3a8c36c84dd8f75e"
+Content-Length: 10247
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -20,8 +20,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081102T220000Z
 DURATION:PT30M
@@ -31,19 +31,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081103T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081104T220000Z
 DURATION:PT30M
@@ -53,19 +42,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081105T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081106T220000Z
 DURATION:PT30M
@@ -75,8 +53,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081109T220000Z
 DURATION:PT30M
@@ -86,19 +64,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081110T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081111T220000Z
 DURATION:PT30M
@@ -108,19 +75,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081112T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081113T220000Z
 DURATION:PT30M
@@ -130,8 +86,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081116T220000Z
 DURATION:PT30M
@@ -141,19 +97,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081117T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081118T220000Z
 DURATION:PT30M
@@ -163,19 +108,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081119T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081120T220000Z
 DURATION:PT30M
@@ -185,8 +119,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081123T220000Z
 DURATION:PT30M
@@ -196,19 +130,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081124T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081125T220000Z
 DURATION:PT30M
@@ -218,19 +141,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081126T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081127T220000Z
 DURATION:PT30M
@@ -240,8 +152,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081130T220000Z
 DURATION:PT30M
@@ -440,6 +352,48 @@ DTSTART:20081128T080000Z
 DURATION:P1D
 END:VEVENT
 END:VCALENDAR
+</C:calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user2/home/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
+  <propstat>
+   <prop>
+    <C:calendar-data>BEGIN:VCALENDAR
+PRODID:-//davical.org//NONSGML AWL Calendar//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+LAST-MODIFIED:20081123T210725Z
+SEQUENCE:6
+UID:bd262d20-1cdb-012d-1264-002421a2359e
+SUMMARY:Afternoon run
+DESCRIPTION:
+CREATED:20081123T210644Z
+DTSTAMP:20081123T210725Z
+DURATION:PT1H
+LOCATION:
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
+DTSTART:20081123T230000Z
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20081123T210725Z
+SEQUENCE:6
+UID:bd262d20-1cdb-012d-1264-002421a2359e
+SUMMARY:Afternoon run
+DESCRIPTION:
+CREATED:20081123T210644Z
+DTSTAMP:20081123T210725Z
+DURATION:PT1H
+LOCATION:
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
+DTSTART:20081130T230000Z
+DURATION:PT1H
+END:VEVENT
+END:VCALENDAR
 </C:calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -450,7 +404,7 @@ END:VCALENDAR
          dav_name: >/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics<
           dtstart: >2008-10-20 11:00:00+13<
       dtstart_utc: >2008-10-19 22:00:00<
-            rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR<
+            rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR<
 
          dav_name: >/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics<
           dtstart: >2008-10-20 09:00:00+13<
@@ -467,3 +421,8 @@ END:VCALENDAR
       dtstart_utc: >2008-10-06 07:00:00<
             rrule: >FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1<
 
+         dav_name: >/user2/home/bd262d20-1cdb-012d-1264-002421a2359e.ics<
+          dtstart: >2008-11-24 12:00:00+13<
+      dtstart_utc: >2008-11-23 23:00:00<
+            rrule: >FREQ=WEEKLY;INTERVAL=1;BYDAY=SU<
+
diff --git a/testing/tests/regression-suite/961-REPORT-public-expanded.result b/testing/tests/regression-suite/961-REPORT-public-expanded.result
index d604c537..564b2a92 100644
--- a/testing/tests/regression-suite/961-REPORT-public-expanded.result
+++ b/testing/tests/regression-suite/961-REPORT-public-expanded.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, calendar-access
-ETag: "76609547b1a059d8ad4f3657485c5fe1"
-Content-Length: 9578
+ETag: "731b7b4cc583c90070deab037b5acc6d"
+Content-Length: 6031
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -20,8 +20,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081019T220000Z
 DURATION:PT30M
@@ -31,19 +31,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081020T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081021T220000Z
 DURATION:PT30M
@@ -53,19 +42,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081022T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081023T220000Z
 DURATION:PT30M
@@ -75,8 +53,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081026T220000Z
 DURATION:PT30M
@@ -86,19 +64,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081027T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081028T220000Z
 DURATION:PT30M
@@ -108,19 +75,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081029T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081030T220000Z
 DURATION:PT30M
@@ -130,8 +86,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081102T220000Z
 DURATION:PT30M
@@ -141,19 +97,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081103T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081104T220000Z
 DURATION:PT30M
@@ -163,19 +108,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081105T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081106T220000Z
 DURATION:PT30M
@@ -185,8 +119,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081109T220000Z
 DURATION:PT30M
@@ -196,19 +130,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081110T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081111T220000Z
 DURATION:PT30M
@@ -218,19 +141,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081112T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081113T220000Z
 DURATION:PT30M
@@ -240,8 +152,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081116T220000Z
 DURATION:PT30M
@@ -251,19 +163,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081117T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081118T220000Z
 DURATION:PT30M
@@ -273,19 +174,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081119T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081120T220000Z
 DURATION:PT30M
@@ -295,8 +185,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081123T220000Z
 DURATION:PT30M
@@ -306,19 +196,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081124T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081125T220000Z
 DURATION:PT30M
@@ -328,19 +207,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081126T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081127T220000Z
 DURATION:PT30M
@@ -350,8 +218,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081130T220000Z
 DURATION:PT30M
diff --git a/testing/tests/regression-suite/962-BIND.result b/testing/tests/regression-suite/962-BIND.result
index 903f2e6c..d5f490ea 100644
--- a/testing/tests/regression-suite/962-BIND.result
+++ b/testing/tests/regression-suite/962-BIND.result
@@ -6,7 +6,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1432<
+          bind_id: >1433<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/regression-suite/963-BIND.result b/testing/tests/regression-suite/963-BIND.result
index 1adef788..01de7722 100644
--- a/testing/tests/regression-suite/963-BIND.result
+++ b/testing/tests/regression-suite/963-BIND.result
@@ -8,7 +8,7 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1432<
+          bind_id: >1433<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/regression-suite/965-PROPFIND.result b/testing/tests/regression-suite/965-PROPFIND.result
index bb00b15e..d83d6dcb 100644
--- a/testing/tests/regression-suite/965-PROPFIND.result
+++ b/testing/tests/regression-suite/965-PROPFIND.result
@@ -72,8 +72,8 @@
   <href>/caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
-    <getetag>"64d28f4f57515d6c63cec02b5d882eaa"</getetag>
-    <displayname>Daily Action Meeting</displayname>
+    <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
+    <displayname>Near Daily Action Meeting</displayname>
     <owner>
      <href>/caldav.php/user2/</href>
     </owner>
@@ -144,4 +144,23 @@
    <status>HTTP/1.1 403 Forbidden</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user4/user2/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"671d4ee904be6c16dd1be076619fe7c0"</getetag>
+    <displayname>Afternoon run</displayname>
+    <owner>
+     <href>/caldav.php/user2/</href>
+    </owner>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <current-user-privilege-set/>
+   </prop>
+   <status>HTTP/1.1 403 Forbidden</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/966-REPORT-bound.result b/testing/tests/regression-suite/966-REPORT-bound.result
index bbe7b0df..9bb5961e 100644
--- a/testing/tests/regression-suite/966-REPORT-bound.result
+++ b/testing/tests/regression-suite/966-REPORT-bound.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "46385e06c78acb23818555378cced9bd"
-Content-Length: 3517
+ETag: "1906d52bec5b04408739a88cd9d6dd97"
+Content-Length: 3516
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
-    <getetag>"64d28f4f57515d6c63cec02b5d882eaa"</getetag>
+    <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
     <C:calendar-data>BEGIN:VCALENDAR
 PRODID:-//davical.org//NONSGML AWL Calendar//EN
 VERSION:2.0
@@ -21,8 +21,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 DTSTART;TZID=Pacific/Auckland:20081020T110000
 DTEND;TZID=Pacific/Auckland:20081020T113000
 X-MOZ-GENERATION:2
diff --git a/testing/tests/regression-suite/967-PROPFIND.result b/testing/tests/regression-suite/967-PROPFIND.result
index f37bc308..0881afa7 100644
--- a/testing/tests/regression-suite/967-PROPFIND.result
+++ b/testing/tests/regression-suite/967-PROPFIND.result
@@ -26,7 +26,7 @@
    <prop>
     <getcontenttype>text/calendar</getcontenttype>
     <resourcetype/>
-    <getetag>"64d28f4f57515d6c63cec02b5d882eaa"</getetag>
+    <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -64,4 +64,15 @@
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user4/user2/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
+  <propstat>
+   <prop>
+    <getcontenttype>text/calendar</getcontenttype>
+    <resourcetype/>
+    <getetag>"671d4ee904be6c16dd1be076619fe7c0"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/968-GET-bound.result b/testing/tests/regression-suite/968-GET-bound.result
index 6030a39e..01bba3f4 100644
--- a/testing/tests/regression-suite/968-GET-bound.result
+++ b/testing/tests/regression-suite/968-GET-bound.result
@@ -1,8 +1,8 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-Etag: "64d28f4f57515d6c63cec02b5d882eaa"
-Content-Length: 859
+Etag: "f2c974ff51cb52cde0668544deb36380"
+Content-Length: 858
 Content-Type: text/calendar; charset="utf-8"
 
 BEGIN:VCALENDAR
@@ -14,8 +14,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 DTSTART;TZID=Pacific/Auckland:20081020T110000
 DTEND;TZID=Pacific/Auckland:20081020T113000
 X-MOZ-GENERATION:2
diff --git a/testing/tests/regression-suite/969-REPORT-bound.result b/testing/tests/regression-suite/969-REPORT-bound.result
index cd8dd2f2..f9fa219f 100644
--- a/testing/tests/regression-suite/969-REPORT-bound.result
+++ b/testing/tests/regression-suite/969-REPORT-bound.result
@@ -13,8 +13,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081019T220000Z
 DURATION:PT30M
@@ -24,19 +24,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081020T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081021T220000Z
 DURATION:PT30M
@@ -46,19 +35,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081022T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081023T220000Z
 DURATION:PT30M
@@ -68,8 +46,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081026T220000Z
 DURATION:PT30M
@@ -79,19 +57,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081027T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081028T220000Z
 DURATION:PT30M
@@ -101,19 +68,8 @@ CREATED:20081023T054958Z
 LAST-MODIFIED:20081023T055044Z
 DTSTAMP:20081023T054958Z
 UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081029T220000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
 X-MOZ-GENERATION:2
 DTSTART:20081030T220000Z
 DURATION:PT30M
diff --git a/testing/tests/regression-suite/972-BIND.result b/testing/tests/regression-suite/972-BIND.result
index 7a241602..4c770d0c 100644
--- a/testing/tests/regression-suite/972-BIND.result
+++ b/testing/tests/regression-suite/972-BIND.result
@@ -6,14 +6,14 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1432<
+          bind_id: >1433<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
  parent_container: >/user4/<
  ticket_id_length: >8<
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
diff --git a/testing/tests/regression-suite/982-BIND.result b/testing/tests/regression-suite/982-BIND.result
index 796761a1..c31b69f1 100644
--- a/testing/tests/regression-suite/982-BIND.result
+++ b/testing/tests/regression-suite/982-BIND.result
@@ -6,21 +6,21 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1432<
+          bind_id: >1433<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1437<
+          bind_id: >1438<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
diff --git a/testing/tests/regression-suite/983-BIND.result b/testing/tests/regression-suite/983-BIND.result
index f76ae0ae..f09d53a2 100644
--- a/testing/tests/regression-suite/983-BIND.result
+++ b/testing/tests/regression-suite/983-BIND.result
@@ -6,28 +6,28 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1432<
+          bind_id: >1433<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1437<
+          bind_id: >1438<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1438<
+          bind_id: >1439<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/regression-suite/984-BIND.result b/testing/tests/regression-suite/984-BIND.result
index 294bd7ea..29ec2a61 100644
--- a/testing/tests/regression-suite/984-BIND.result
+++ b/testing/tests/regression-suite/984-BIND.result
@@ -8,28 +8,28 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1432<
+          bind_id: >1433<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1437<
+          bind_id: >1438<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1438<
+          bind_id: >1439<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/regression-suite/985-PROPFIND.result b/testing/tests/regression-suite/985-PROPFIND.result
index 5a70ae37..7741c07b 100644
--- a/testing/tests/regression-suite/985-PROPFIND.result
+++ b/testing/tests/regression-suite/985-PROPFIND.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1435</href>
+     <href>/caldav.php/.resources/1436</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -90,7 +90,7 @@
    <prop>
     <displayname>A sub collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1436</href>
+     <href>/caldav.php/.resources/1437</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/regression-suite/987-PROPFIND.result b/testing/tests/regression-suite/987-PROPFIND.result
index 321af860..a911d1c8 100644
--- a/testing/tests/regression-suite/987-PROPFIND.result
+++ b/testing/tests/regression-suite/987-PROPFIND.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1435</href>
+     <href>/caldav.php/.resources/1436</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/regression-suite/992-BIND-admin.result b/testing/tests/regression-suite/992-BIND-admin.result
index 6aceacfa..12c2c623 100644
--- a/testing/tests/regression-suite/992-BIND-admin.result
+++ b/testing/tests/regression-suite/992-BIND-admin.result
@@ -6,7 +6,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1432<
+          bind_id: >1433<
        bind_owner: >6<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
@@ -18,7 +18,7 @@ target_collection: >11<
 target_resource_i: >NULL<
      ticket_owner: >4<
 
-          bind_id: >1433<
+          bind_id: >1434<
        bind_owner: >6<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
@@ -30,7 +30,7 @@ target_collection: >10<
 target_resource_i: >NULL<
      ticket_owner: >3<
 
-          bind_id: >1437<
+          bind_id: >1438<
        bind_owner: >6<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
@@ -42,7 +42,7 @@ target_collection: >10<
 target_resource_i: >NULL<
      ticket_owner: >3<
 
-          bind_id: >1438<
+          bind_id: >1439<
        bind_owner: >6<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
@@ -54,7 +54,7 @@ target_collection: >11<
 target_resource_i: >NULL<
      ticket_owner: >4<
 
-          bind_id: >1451<
+          bind_id: >1452<
        bind_owner: >1<
   bound_source_id: >12<
   dav_displayname: >user3 home<
diff --git a/testing/tests/regression-suite/994-DELETE-admin-bind.result b/testing/tests/regression-suite/994-DELETE-admin-bind.result
index bca29da2..1e0b3493 100644
--- a/testing/tests/regression-suite/994-DELETE-admin-bind.result
+++ b/testing/tests/regression-suite/994-DELETE-admin-bind.result
@@ -5,14 +5,14 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1437<
+          bind_id: >1438<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
      dav_owner_id: >6<
  parent_container: >/user4/base/<
 
-          bind_id: >1438<
+          bind_id: >1439<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<