diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
index 1a94b1554..8bd6b40d0 100644
--- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
+++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
@@ -756,6 +756,10 @@ public ObjectCluster buildMsg(byte[] newPacket, COMMUNICATION_TYPE fwType, boole
 		else {
 			if (!isRtcDifferenceSet()){
 				//sd log time stamp already included in mnChannels
+				if(isEXGUsingDefaultECGConfiguration() || isEXGUsingDefaultRespirationConfiguration()){
+					//HACK for CON-644 -> Do not merge to Dev/Master
+					numAdditionalChannels += 1;
+				}
 			} 
 			else {
 				//for RTC
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/calibration/CalibDetailsKinematic.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/calibration/CalibDetailsKinematic.java
index 991c3b3f6..c9ec3020c 100644
--- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/calibration/CalibDetailsKinematic.java
+++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/calibration/CalibDetailsKinematic.java
@@ -214,7 +214,7 @@ public boolean isSensitivityWithinRangeOfDefault(){
 		    	 }
 		     }
 		}
-		
+		isValid = true; //HACK for CON-645 -> Do not merge to Dev/Master
 		return isValid;
 	}