diff --git a/ipojo/handler/eventadmin/doc/changelog.txt b/ipojo/handler/eventadmin/doc/changelog.txt
index 2ddfbf2..76fb707 100644
--- a/ipojo/handler/eventadmin/doc/changelog.txt
+++ b/ipojo/handler/eventadmin/doc/changelog.txt
@@ -1,3 +1,8 @@
+Changes from the 1.4.0 to 1.6.0
+-------------------------------
+** Bug
+    * [FELIX-1938] - Bad error message when an Event Subscriber does not set the data type and data key
+    
 Changes from 1.2.0 to 1.4.0
 ---------------------------     
 ** Improvement
diff --git a/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/DynamicMBeanImpl.java b/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/DynamicMBeanImpl.java
index dfe9b40..dc3e8c1 100644
--- a/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/DynamicMBeanImpl.java
+++ b/ipojo/handler/jmx/src/main/java/org/apache/felix/ipojo/handlers/jmx/DynamicMBeanImpl.java
@@ -232,16 +232,16 @@
             }
         } else { // if non null value, make sure it is assignable to the
             // attribute
-            if (true /* TODO type.class.isAssignableFrom(value.getClass()) */) {
+//            if (true /* TODO type.class.isAssignableFrom(value.getClass()) */) {
                 // propertyField.setValue(value);
                 // setValue(attributeField.getField(),null);
-                m_instanceManager.onSet(null, propertyField.getField(), value);
-            } else {
-                throw new InvalidAttributeValueException(
-                    "Cannot set attribute " + name + " to a "
-                            + value.getClass().getName()
-                            + " object, String expected");
-            }
+            m_instanceManager.onSet(null, propertyField.getField(), value);
+//            } else {
+//                throw new InvalidAttributeValueException(
+//                    "Cannot set attribute " + name + " to a "
+//                            + value.getClass().getName()
+//                            + " object, String expected");
+//            }
         }
 
     }
diff --git a/ipojo/handler/temporal/doc/changelog.txt b/ipojo/handler/temporal/doc/changelog.txt
index 4439d23..5d9d38b 100644
--- a/ipojo/handler/temporal/doc/changelog.txt
+++ b/ipojo/handler/temporal/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from the 1.4.2 to 1.6.0
+-------------------------------
+** Improvement
+    * [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified
+
+    
 Changes from 1.2.0 to 1.4.0
 ---------------------------
 ** Improvement