diff --git a/bacnet-stack/demo/handler/h_rpm.c b/bacnet-stack/demo/handler/h_rpm.c
index 8bdc0da5..de3d7ff7 100644
--- a/bacnet-stack/demo/handler/h_rpm.c
+++ b/bacnet-stack/demo/handler/h_rpm.c
@@ -96,19 +96,27 @@ void handler_read_property_multiple(uint8_t * service_request, uint16_t service_
     /* bad decoding - send an abort */
     if (service_len == 0)
     {
-        apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id, ABORT_REASON_OTHER, true);
+        apdu_len = abort_encode_apdu(
+            &Handler_Transmit_Buffer[npdu_len],
+            service_data->invoke_id,
+            ABORT_REASON_OTHER, true);
 #if PRINT_ENABLED
         printf("RPM: Sending Abort!\r\n");
 #endif
     } else if (service_data->segmented_message) {
-        apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
+        apdu_len = abort_encode_apdu(
+            &Handler_Transmit_Buffer[npdu_len],
+            service_data->invoke_id,
+            ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
 #if PRINT_ENABLED
     printf("RPM: Sending Abort!\r\n");
 #endif
     } else {
         /* decode apdu request & encode apdu reply
            encode complex ack, invoke id, service choice */
-        apdu_len = rpm_ack_encode_apdu_init(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id);
+        apdu_len = rpm_ack_encode_apdu_init(
+            &Handler_Transmit_Buffer[npdu_len],
+            service_data->invoke_id);
         do
         {
             len = rpm_ack_decode_object_id(
@@ -360,7 +368,11 @@ void handler_read_property_multiple(uint8_t * service_request, uint16_t service_
                 if (!error && property_found) {
                     len = encode_closing_tag(&Temp_Buf[0], 4);
                     if (!copy_apdu_data_buffer(&apdu_len, len, npdu_len)) {
-                        apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
+                        apdu_len = abort_encode_apdu(
+                            &Handler_Transmit_Buffer[npdu_len],
+                            service_data->invoke_id,
+                            ABORT_REASON_SEGMENTATION_NOT_SUPPORTED,
+                            true);
                         break;
                     }
                 } else {
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 40f9a914..1803be80 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -78,6 +78,12 @@ static int Device_Properties_Required[] =
 
 static int Device_Properties_Optional[] = 
 {
+    PROP_DESCRIPTION,
+    PROP_LOCAL_TIME,
+    PROP_UTC_OFFSET,
+    PROP_LOCAL_DATE,
+    PROP_DAYLIGHT_SAVINGS_STATUS,
+    PROP_PROTOCOL_CONFORMANCE_CLASS,
     -1
 };
 
diff --git a/bacnet-stack/doc/RPM-Handler.flw b/bacnet-stack/doc/RPM-Handler.flw
new file mode 100644
index 00000000..e7790284
Binary files /dev/null and b/bacnet-stack/doc/RPM-Handler.flw differ