diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md
index c9ca93cf..93ed43d9 100644
--- a/RELEASENOTES-DEVELOPMENT.md
+++ b/RELEASENOTES-DEVELOPMENT.md
@@ -1,6 +1,12 @@
+Version-4.1-dev-146-g42e508b4
+====
+#### Enhancements
+* Extract several very useful extra pieces of client metadata for AP2. Many thanks to [Cody Cutrer](https://github.com/ccutrer).
+* Enable a cleaner restart of the D-Bus daemon in a Docker image. Thanks again to [Charles Omer](https://github.com/charlesomer).
+
 Version-4.1-dev-138-g5617f40e
 ====
-### Minor Internal Changes
+#### Minor Internal Changes
 * A small number of internal chages made.
 
 Version-4.1-dev-127-g4d0460b9
diff --git a/rtsp.c b/rtsp.c
index 9c8536f4..83dd4913 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -2618,6 +2618,8 @@ void handle_flush(rtsp_conn_info *conn, rtsp_message *req, rtsp_message *resp) {
 
 #ifdef CONFIG_AIRPLAY_2
 
+
+#ifdef CONFIG_METADATA
 static void check_and_send_plist_metadata(plist_t messagePlist, const char *plist_key, uint32_t metadata_code)
 {
   plist_t item = plist_dict_get_item(messagePlist, plist_key);
@@ -2629,6 +2631,7 @@ static void check_and_send_plist_metadata(plist_t messagePlist, const char *plis
     }
   }
 }
+#endif
 
 void handle_setup_2(rtsp_conn_info *conn, rtsp_message *req, rtsp_message *resp) {
   int err;