diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result
index 1789afcc..9f8b7c28 100644
--- a/testing/tests/binding/1000-BIND.result
+++ b/testing/tests/binding/1000-BIND.result
@@ -7,7 +7,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1564<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result
index 0dd61a4a..9b49a31f 100644
--- a/testing/tests/binding/1001-BIND.result
+++ b/testing/tests/binding/1001-BIND.result
@@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1564<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result
index 4c7a1f8f..08bc56be 100644
--- a/testing/tests/binding/1004-PROPFIND-bound.result
+++ b/testing/tests/binding/1004-PROPFIND-bound.result
@@ -82,7 +82,7 @@
    <prop>
     <displayname>US Holidays</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1432</href>
+     <href>/caldav.php/.resources/1466</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -100,7 +100,7 @@
    <prop>
     <displayname>User 4 Outbox</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1562</href>
+     <href>/caldav.php/.resources/1596</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result
index 0155217a..501880ed 100644
--- a/testing/tests/binding/1012-BIND.result
+++ b/testing/tests/binding/1012-BIND.result
@@ -7,14 +7,14 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1564<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
  parent_container: >/user4/<
  ticket_id_length: >8<
 
-          bind_id: >1565<
+          bind_id: >1599<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result
index 661a707d..4ebb1151 100644
--- a/testing/tests/binding/1022-BIND.result
+++ b/testing/tests/binding/1022-BIND.result
@@ -7,21 +7,21 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1564<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1565<
+          bind_id: >1599<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1569<
+          bind_id: >1603<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result
index be6f5199..07b53394 100644
--- a/testing/tests/binding/1023-BIND.result
+++ b/testing/tests/binding/1023-BIND.result
@@ -7,28 +7,28 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1563<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1564<
+          bind_id: >1599<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1568<
+          bind_id: >1603<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1569<
+          bind_id: >1604<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result
index 8e54c161..c6011af2 100644
--- a/testing/tests/binding/1024-BIND.result
+++ b/testing/tests/binding/1024-BIND.result
@@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1564<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1565<
+          bind_id: >1599<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1569<
+          bind_id: >1603<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1570<
+          bind_id: >1604<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result
index 06a48284..31a77a7b 100644
--- a/testing/tests/binding/1025-PROPFIND.result
+++ b/testing/tests/binding/1025-PROPFIND.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1567</href>
+     <href>/caldav.php/.resources/1601</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -90,7 +90,7 @@
    <prop>
     <displayname>A sub collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1568</href>
+     <href>/caldav.php/.resources/1602</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result
index bb1a4587..ca3cb38d 100644
--- a/testing/tests/binding/1027-PROPFIND.result
+++ b/testing/tests/binding/1027-PROPFIND.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1567</href>
+     <href>/caldav.php/.resources/1601</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result
index 1320bee6..5768fb8d 100644
--- a/testing/tests/binding/1032-BIND-admin.result
+++ b/testing/tests/binding/1032-BIND-admin.result
@@ -7,7 +7,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1564<
+          bind_id: >1598<
        bind_owner: >1005<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
@@ -19,7 +19,7 @@ target_collection: >11<
 target_resource_i: >NULL<
      ticket_owner: >1003<
 
-          bind_id: >1565<
+          bind_id: >1599<
        bind_owner: >1005<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
@@ -31,7 +31,7 @@ target_collection: >10<
 target_resource_i: >NULL<
      ticket_owner: >1002<
 
-          bind_id: >1569<
+          bind_id: >1603<
        bind_owner: >1005<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
@@ -43,7 +43,7 @@ target_collection: >10<
 target_resource_i: >NULL<
      ticket_owner: >1002<
 
-          bind_id: >1570<
+          bind_id: >1604<
        bind_owner: >1005<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
@@ -55,7 +55,7 @@ target_collection: >11<
 target_resource_i: >NULL<
      ticket_owner: >1003<
 
-          bind_id: >1583<
+          bind_id: >1617<
        bind_owner: >1<
   bound_source_id: >12<
   dav_displayname: >user3 home<
diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result
index b1a74b04..1a74976f 100644
--- a/testing/tests/binding/1034-DELETE-admin-bind.result
+++ b/testing/tests/binding/1034-DELETE-admin-bind.result
@@ -6,14 +6,14 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1569<
+          bind_id: >1603<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
      dav_owner_id: >1005<
  parent_container: >/user4/base/<
 
-          bind_id: >1570<
+          bind_id: >1604<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result
index b39ded27..764319fb 100644
--- a/testing/tests/binding/1100-BIND.result
+++ b/testing/tests/binding/1100-BIND.result
@@ -7,36 +7,36 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1564<
+          bind_id: >1598<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1565<
+          bind_id: >1599<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1569<
+          bind_id: >1603<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1570<
+          bind_id: >1604<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1584<
-  bound_source_id: >1567<
+          bind_id: >1618<
+  bound_source_id: >1601<
   dav_displayname: >A normal collection<
          dav_name: >/user4/boundbase/<
            length: >NULL<
diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result
index e2c06708..256d50ba 100644
--- a/testing/tests/binding/1101-PROPFIND-normal.result
+++ b/testing/tests/binding/1101-PROPFIND-normal.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1567</href>
+     <href>/caldav.php/.resources/1601</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -90,7 +90,7 @@
    <prop>
     <displayname>A sub collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1568</href>
+     <href>/caldav.php/.resources/1602</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -112,7 +112,7 @@
    <prop>
     <displayname>newcalendar</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1573</href>
+     <href>/caldav.php/.resources/1607</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result
index ab3b6142..9c3efc47 100644
--- a/testing/tests/binding/1102-PROPFIND-bound.result
+++ b/testing/tests/binding/1102-PROPFIND-bound.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1567</href>
+     <href>/caldav.php/.resources/1601</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -99,7 +99,7 @@
    <prop>
     <displayname>A sub collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1568</href>
+     <href>/caldav.php/.resources/1602</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -125,7 +125,7 @@
    <prop>
     <displayname>newcalendar</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1573</href>
+     <href>/caldav.php/.resources/1607</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result
index e439b1ed..45cef7fb 100644
--- a/testing/tests/binding/Restore-Database.result
+++ b/testing/tests/binding/Restore-Database.result
@@ -1,6 +1,6 @@
  setval 
 --------
-   1563
+   1597
 (1 row)
 
  setval 
diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result
index 787728ec..c4f669cc 100644
--- a/testing/tests/carddav/Restore-Database.result
+++ b/testing/tests/carddav/Restore-Database.result
@@ -1,6 +1,6 @@
  setval 
 --------
-   1584
+   1618
 (1 row)
 
  setval 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result
new file mode 100644
index 00000000..b0cf763c
--- /dev/null
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result
@@ -0,0 +1,12 @@
+HTTP/1.1 100 Continue
+
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+            count: >34<
+
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
new file mode 100644
index 00000000..495ea063
--- /dev/null
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
@@ -0,0 +1,28 @@
+#
+# PUT a calendar collection to user3 to test UTF-8 processing
+#
+TYPE=PUT
+URL=http://mycaldav/caldav.php/user3/utf8/
+HEADER=User-Agent: RSCDS Testing/0.9.x
+HEADER=Content-Type: text/calendar; charset=utf-8
+AUTH=user3:user3
+
+HEAD
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user, 
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       description, priority, class, transp, rrule, url,
+       percent_complete, tz_id, status,
+       caldav_data AS "A1 CalDAV DATA"
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+WHERE caldav_data.dav_name ~ '^/user3/utf8/'
+ENDQUERY
+
+QUERY
+SELECT count(*)
+  FROM caldav_data JOIN calendar_item USING(dav_name)
+  WHERE caldav_data.dav_name ~ '^/user3/utf8/'
+ENDQUERY
+
+DATA=utf8-test
diff --git a/testing/tests/regression-suite/0889-POST-freebusy.result b/testing/tests/regression-suite/0889-POST-freebusy.result
index be19e043..2a970bfd 100644
--- a/testing/tests/regression-suite/0889-POST-freebusy.result
+++ b/testing/tests/regression-suite/0889-POST-freebusy.result
@@ -3033,6 +3033,32 @@ BEGIN:VFREEBUSY
 DTSTAMP:yyyymmddThhmmssZ
 DTSTART:20001021T110000Z
 DTEND:20101106T110000Z
+FREEBUSY:20070611T011500Z/20070611T014500Z
+FREEBUSY:20070611T020000Z/20070611T060000Z
+FREEBUSY:20070611T040000Z/20070611T060000Z
+FREEBUSY:20070611T060000Z/20070611T061500Z
+FREEBUSY:20070611T230000Z/20070611T235000Z
+FREEBUSY:20070612T040000Z/20070612T052000Z
+FREEBUSY:20070612T060000Z/20070612T063000Z
+FREEBUSY:20070612T060000Z/20070612T080000Z
+FREEBUSY:20070612T060000Z/20070612T090000Z
+FREEBUSY:20070612T220000Z/20070612T231000Z
+FREEBUSY:20070613T060000Z/20070613T083000Z
+FREEBUSY:20070613T120000Z/20070621T120000Z
+FREEBUSY:20070613T220000Z/20070613T230000Z
+FREEBUSY:20070614T120000Z/20070617T120000Z
+FREEBUSY:20070615T120000Z/20070616T120000Z
+FREEBUSY:20070627T034500Z/20070627T114500Z
+FREEBUSY:20070627T120000Z/20070628T120000Z
+FREEBUSY:20070628T073000Z/20070628T103000Z
+FREEBUSY:20070628T120000Z/20070629T120000Z
+FREEBUSY:20070629T120000Z/20070630T120000Z
+FREEBUSY:20070709T213000Z/20070710T000000Z
+FREEBUSY:20070712T120000Z/20070713T120000Z
+FREEBUSY:20070819T210000Z/20070820T031500Z
+FREEBUSY:20070823T120000Z/20070824T120000Z
+FREEBUSY:20070914T120000Z/20070915T120000Z
+FREEBUSY:20071110T110000Z/20071111T110000Z
 FREEBUSY:20081024T054500Z/20081024T083000Z
 FREEBUSY:20081025T103000Z/20081025T113000Z
 FREEBUSY:20081028T064500Z/20081028T093000Z
diff --git a/testing/tests/regression-suite/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result
index 3235122e..79f46dff 100644
--- a/testing/tests/regression-suite/0902-PUT-collection.result
+++ b/testing/tests/regression-suite/0902-PUT-collection.result
@@ -16,7 +16,7 @@ Content-Type: text/plain; charset="utf-8"
 
         attendees: >40<
 
-    collection_id: >1529<
+    collection_id: >1563<
   dav_displayname: >anotherone<
          dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a<
          dav_name: >/user1/anotherone/<
diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result
index df9992d0..818cbc17 100644
--- a/testing/tests/regression-suite/0924-MOVE.result
+++ b/testing/tests/regression-suite/0924-MOVE.result
@@ -6,9 +6,9 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-    cd_collection: >1529<
+    cd_collection: >1563<
        cd_user_no: >10<
-    ci_collection: >1529<
+    ci_collection: >1563<
        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/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result
index a04ff26f..384297ed 100644
--- a/testing/tests/regression-suite/0950-MKTICKET.result
+++ b/testing/tests/regression-suite/0950-MKTICKET.result
@@ -39,6 +39,6 @@ target_resource_i: >NULL<
      dav_owner_id: >1002<
        privileges: >000000000001001011100111<
 target_collection: >10<
-target_resource_i: >1496<
+target_resource_i: >1530<
           timeout: >1 day<
 
diff --git a/testing/tests/regression-suite/0951-MKTICKET.result b/testing/tests/regression-suite/0951-MKTICKET.result
index 9186f0bc..09926546 100644
--- a/testing/tests/regression-suite/0951-MKTICKET.result
+++ b/testing/tests/regression-suite/0951-MKTICKET.result
@@ -19,6 +19,6 @@ target_resource_i: >NULL<
      dav_owner_id: >1002<
        privileges: >000000000001001011100111<
 target_collection: >10<
-target_resource_i: >1496<
+target_resource_i: >1530<
           timeout: >24:00:00<
 
diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result
index ef26bb9a..cbdb16b7 100644
--- a/testing/tests/scheduling/Restore-Database.result
+++ b/testing/tests/scheduling/Restore-Database.result
@@ -1,6 +1,6 @@
  setval 
 --------
-   1596
+   1630
 (1 row)
 
  setval