diff --git a/.gitattributes b/.gitattributes
index 07f42c74261803998ad18f2f6a11f00c17cdc60d..beadbaccef7f3876de447fc364d748a50c7c8d22 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3589,6 +3589,8 @@ MAC/Deployment/data/StaticMetaData/CableDelays/CS302-CableDelays.conf -text
 MAC/Deployment/data/StaticMetaData/CableDelays/CS401-CableDelays.conf -text
 MAC/Deployment/data/StaticMetaData/CableDelays/CableDelays_default.conf -text
 MAC/Deployment/data/StaticMetaData/CableDelays/DE609-CableDelays.conf -text
+MAC/Deployment/data/StaticMetaData/CableDelays/PL610-CableDelays.conf -text
+MAC/Deployment/data/StaticMetaData/CableDelays/PL611-CableDelays.conf -text
 MAC/Deployment/data/StaticMetaData/CableDelays/PL612-CableDelays.conf -text
 MAC/Deployment/data/StaticMetaData/CableDelays/RS106-CableDelays.conf -text
 MAC/Deployment/data/StaticMetaData/CableDelays/RS208-CableDelays.conf -text
diff --git a/MAC/Deployment/data/StaticMetaData/CableDelays/PL610-CableDelays.conf b/MAC/Deployment/data/StaticMetaData/CableDelays/PL610-CableDelays.conf
new file mode 100644
index 0000000000000000000000000000000000000000..400f57da5b46f99a1047d09b435cdddeb853c1cc
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/CableDelays/PL610-CableDelays.conf
@@ -0,0 +1,216 @@
+#
+# CableDelays.conf PL610
+#
+# This file contains for each input of each RCU the delay the length of the cable
+# connected to it adds to the signal path.
+#
+# Lenghts are in meters, delays are in ns.
+#
+# Note: The first order values are:
+#   50m     199.2573
+#   80m     326.9640
+#   85m     342.5133
+#   115m    465.5254
+#   130m    530.6981
+#
+#  T81, RCU 162, new 115m (wrong in table 130m, is corrected)
+#  T81, RCU 163, new 115m (wrong in table 130m, is corrected)
+#  T93, RCU 186, new 130m (wrong in table 115m, is corrected)
+#  T93, RCU 167, new 130m (wrong in table 115m, is corrected)
+#
+#
+#		LBL           		LBH             	HBA
+#RCUnr  len 	delay       	len 	delay       	len 	delay
+#-----------------------------------------------------------------------
+0	0	0		115	465.5254	85	342.5133
+1	0	0		115	465.5254	85	342.5133
+2	0	0		115	465.5254	85	342.5133
+3	0	0		115	465.5254	85	342.5133
+4	0	0		115	465.5254	85	342.5133
+5	0	0		115	465.5254	85	342.5133
+6	0	0		115	465.5254	85	342.5133
+7	0	0		115	465.5254	85	342.5133
+8	0	0		85	342.5133	85	342.5133
+9	0	0		85	342.5133	85	342.5133
+10	0	0		85	342.5133	85	342.5133
+11	0	0		85	342.5133	85	342.5133
+12	0	0		85	342.5133	85	342.5133
+13	0	0		85	342.5133	85	342.5133
+14	0	0		85	342.5133	85	342.5133
+15	0	0		85	342.5133	85	342.5133
+16	0	0		115	465.5254	85	342.5133
+17	0	0		115	465.5254	85	342.5133
+18	0	0		115	465.5254	85	342.5133
+19	0	0		115	465.5254	85	342.5133
+20	0	0		115	465.5254	85	342.5133
+21	0	0		115	465.5254	85	342.5133
+22	0	0		115	465.5254	85	342.5133
+23	0	0		115	465.5254	85	342.5133
+24	0	0		85	342.5133	85	342.5133
+25	0	0		85	342.5133	85	342.5133
+26	0	0		115	465.5254	85	342.5133
+27	0	0		115	465.5254	85	342.5133
+28	0	0		85	342.5133	85	342.5133
+29	0	0		85	342.5133	85	342.5133
+30	0	0		85	342.5133	85	342.5133
+31	0	0		85	342.5133	85	342.5133
+32	0	0		85	342.5133	85	342.5133
+33	0	0		85	342.5133	85	342.5133
+34	0	0		115	465.5254	85	342.5133
+35	0	0		115	465.5254	85	342.5133
+36	0	0		115	465.5254	85	342.5133
+37	0	0		115	465.5254	85	342.5133
+38	0	0		115	465.5254	85	342.5133
+39	0	0		115	465.5254	85	342.5133
+40	0	0		115	465.5254	85	342.5133
+41	0	0		115	465.5254	85	342.5133
+42	0	0		115	465.5254	85	342.5133
+43	0	0		115	465.5254	85	342.5133
+44	0	0		115	465.5254	85	342.5133
+45	0	0		115	465.5254	85	342.5133
+46	0	0		115	465.5254	85	342.5133
+47	0	0		115	465.5254	85	342.5133
+48	0	0		115	465.5254	85	342.5133
+49	0	0		115	465.5254	85	342.5133
+50	0	0		115	465.5254	85	342.5133
+51	0	0		115	465.5254	85	342.5133
+52	0	0		115	465.5254	85	342.5133
+53	0	0		115	465.5254	85	342.5133
+54	0	0		115	465.5254	85	342.5133
+55	0	0		115	465.5254	85	342.5133
+56	0	0		85	342.5133	85	342.5133
+57	0	0		85	342.5133	85	342.5133
+58	0	0		85	342.5133	115	465.5254
+59	0	0		85	342.5133	115	465.5254
+60	0	0		115	465.5254	115	465.5254
+61	0	0		115	465.5254	115	465.5254
+62	0	0		85	342.5133	115	465.5254
+63	0	0		85	342.5133	115	465.5254
+64	0	0		115	465.5254	85	342.5133
+65	0	0		115	465.5254	85	342.5133
+66	0	0		85	342.5133	85	342.5133
+67	0	0		85	342.5133	85	342.5133
+68	0	0		85	342.5133	85	342.5133
+69	0	0		85	342.5133	85	342.5133
+70	0	0		85	342.5133	85	342.5133
+71	0	0		85	342.5133	85	342.5133
+72	0	0		85	342.5133	85	342.5133
+73	0	0		85	342.5133	85	342.5133
+74	0	0		85	342.5133	85	342.5133
+75	0	0		85	342.5133	85	342.5133
+76	0	0		85	342.5133	85	342.5133
+77	0	0		85	342.5133	85	342.5133
+78	0	0		85	342.5133	85	342.5133
+79	0	0		85	342.5133	85	342.5133
+80	0	0		115	465.5254	115	465.5254
+81	0	0		115	465.5254	115	465.5254
+82	0	0		115	465.5254	115	465.5254
+83	0	0		115	465.5254	115	465.5254
+84	0	0		115	465.5254	115	465.5254
+85	0	0		115	465.5254	115	465.5254
+86	0	0		115	465.5254	85	342.5133
+87	0	0		115	465.5254	85	342.5133
+88	0	0		115	465.5254	85	342.5133
+89	0	0		115	465.5254	85	342.5133
+90	0	0		115	465.5254	85	342.5133
+91	0	0		115	465.5254	85	342.5133
+92	0	0		115	465.5254	85	342.5133
+93	0	0		115	465.5254	85	342.5133
+94	0	0		115	465.5254	85	342.5133
+95	0	0		115	465.5254	85	342.5133
+96	0	0		85	342.5133	115	465.5254
+97	0	0		85	342.5133	115	465.5254
+98	0	0		115	465.5254	115	465.5254
+99	0	0		115	465.5254	115	465.5254
+100	0	0		85	342.5133	115	465.5254
+101	0	0		85	342.5133	115	465.5254
+102	0	0		85	342.5133	115	465.5254
+103	0	0		85	342.5133	115	465.5254
+104	0	0		115	465.5254	115	465.5254
+105	0	0		115	465.5254	115	465.5254
+106	0	0		115	465.5254	85	342.5133
+107	0	0		115	465.5254	85	342.5133
+108	0	0		85	342.5133	85	342.5133
+109	0	0		85	342.5133	85	342.5133
+110	0	0		85	342.5133	85	342.5133
+111	0	0		85	342.5133	85	342.5133
+112	0	0		115	465.5254	85	342.5133
+113	0	0		115	465.5254	85	342.5133
+114	0	0		115	465.5254	85	342.5133
+115	0	0		115	465.5254	85	342.5133
+116	0	0		115	465.5254	115	465.5254
+117	0	0		115	465.5254	115	465.5254
+118	0	0		85	342.5133	115	465.5254
+119	0	0		85	342.5133	115	465.5254
+120	0	0		85	342.5133	115	465.5254
+121	0	0		85	342.5133	115	465.5254
+122	0	0		115	465.5254	115	465.5254
+123	0	0		115	465.5254	115	465.5254
+124	0	0		115	465.5254	115	465.5254
+125	0	0		115	465.5254	115	465.5254
+126	0	0		115	465.5254	115	465.5254
+127	0	0		115	465.5254	115	465.5254
+128	0	0		85	342.5133	85	342.5133
+129	0	0		85	342.5133	85	342.5133
+130	0	0		115	465.5254	85	342.5133
+131	0	0		115	465.5254	85	342.5133
+132	0	0		85	342.5133	85	342.5133
+133	0	0		85	342.5133	85	342.5133
+134	0	0		85	342.5133	85	342.5133
+135	0	0		85	342.5133	85	342.5133
+136	0	0		115	465.5254	115	465.5254
+137	0	0		115	465.5254	115	465.5254
+138	0	0		115	465.5254	115	465.5254
+139	0	0		115	465.5254	115	465.5254
+140	0	0		115	465.5254	115	465.5254
+141	0	0		115	465.5254	115	465.5254
+142	0	0		115	465.5254	115	465.5254
+143	0	0		115	465.5254	115	465.5254
+144	0	0		85	342.5133	130	530.6981
+145	0	0		85	342.5133	130	530.6981
+146	0	0		85	342.5133	130	530.6981
+147	0	0		85	342.5133	130	530.6981
+148	0	0		85	342.5133	130	530.6981
+149	0	0		85	342.5133	130	530.6981
+150	0	0		85	342.5133	115	465.5254
+151	0	0		85	342.5133	115	465.5254
+152	0	0		115	465.5254	115	465.5254
+153	0	0		115	465.5254	115	465.5254
+154	0	0		115	465.5254	115	465.5254
+155	0	0		115	465.5254	115	465.5254
+156	0	0		115	465.5254	115	465.5254
+157	0	0		115	465.5254	115	465.5254
+158	0	0		115	465.5254	115	465.5254
+159	0	0		115	465.5254	115	465.5254
+160	0	0		115	465.5254	115	465.5254
+161	0	0		115	465.5254	115	465.5254
+162	0	0		85	342.5133	115	465.5254
+163	0	0		85	342.5133	115	465.5254
+164	0	0		85	342.5133	130	530.6981
+165	0	0		85	342.5133	130	530.6981
+166	0	0		115	465.5254	130	530.6981
+167	0	0		115	465.5254	130	530.6981
+168	0	0		115	465.5254	115	465.5254
+169	0	0		115	465.5254	115	465.5254
+170	0	0		85	342.5133	115	465.5254
+171	0	0		85	342.5133	115	465.5254
+172	0	0		85	342.5133	115	465.5254
+173	0	0		85	342.5133	115	465.5254
+174	0	0		85	342.5133	115	465.5254
+175	0	0		85	342.5133	115	465.5254
+176	0	0		115	465.5254	115	465.5254
+177	0	0		115	465.5254	115	465.5254
+178	0	0		115	465.5254	130	530.6981
+179	0	0		115	465.5254	130	530.6981
+180	0	0		115	465.5254	130	530.6981
+181	0	0		115	465.5254	130	530.6981
+182	0	0		115	465.5254	115	465.5254
+183	0	0		115	465.5254	115	465.5254
+184	0	0		115	465.5254	115	465.5254
+185	0	0		115	465.5254	115	465.5254
+186	0	0		115	465.5254	130	530.6981
+187	0	0		115	465.5254	130	530.6981
+188	0	0		115	465.5254	130	530.6981
+189	0	0		115	465.5254	130	530.6981
+190	0	0		85	342.5133	130	530.6981
+191	0	0		85	342.5133	130	530.6981
diff --git a/MAC/Deployment/data/StaticMetaData/CableDelays/PL611-CableDelays.conf b/MAC/Deployment/data/StaticMetaData/CableDelays/PL611-CableDelays.conf
new file mode 100644
index 0000000000000000000000000000000000000000..1d117b9806b90e8862b3682eb1c7ed72e4cb72ac
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/CableDelays/PL611-CableDelays.conf
@@ -0,0 +1,210 @@
+#
+# CableDelays.conf PL611
+#
+# This file contains for each input of each RCU the delay the length of the cable
+# connected to it adds to the signal path.
+#
+# Lenghts are in meters, delays are in ns.
+#
+# Note: The first order values are:
+#   50m     199.2573
+#   80m     326.9640
+#   85m     342.5133
+#   115m    465.5254
+#   130m    530.6981
+#
+#		LBL           		LBH             	HBA
+#RCUnr  len 	delay       	len 	delay       	len 	delay
+#-----------------------------------------------------------------------
+0	0	0		85	342.5133	85	342.5133
+1	0	0		85	342.5133	85	342.5133
+2	0	0		85	342.5133	85	342.5133
+3	0	0		85	342.5133	85	342.5133
+4	0	0		85	342.5133	85	342.5133
+5	0	0		85	342.5133	85	342.5133
+6	0	0		85	342.5133	85	342.5133
+7	0	0		85	342.5133	85	342.5133
+8	0	0		115	465.5254	85	342.5133
+9	0	0		115	465.5254	85	342.5133
+10	0	0		115	465.5254	85	342.5133
+11	0	0		115	465.5254	85	342.5133
+12	0	0		115	465.5254	85	342.5133
+13	0	0		115	465.5254	85	342.5133
+14	0	0		115	465.5254	85	342.5133
+15	0	0		115	465.5254	85	342.5133
+16	0	0		85	342.5133	115	465.5254
+17	0	0		85	342.5133	115	465.5254
+18	0	0		85	342.5133	115	465.5254
+19	0	0		85	342.5133	115	465.5254
+20	0	0		85	342.5133	85	342.5133
+21	0	0		85	342.5133	85	342.5133
+22	0	0		85	342.5133	85	342.5133
+23	0	0		85	342.5133	85	342.5133
+24	0	0		115	465.5254	85	342.5133
+25	0	0		115	465.5254	85	342.5133
+26	0	0		115	465.5254	85	342.5133
+27	0	0		115	465.5254	85	342.5133
+28	0	0		115	465.5254	85	342.5133
+29	0	0		115	465.5254	85	342.5133
+30	0	0		115	465.5254	85	342.5133
+31	0	0		115	465.5254	85	342.5133
+32	0	0		115	465.5254	115	465.5254
+33	0	0		115	465.5254	115	465.5254
+34	0	0		115	465.5254	115	465.5254
+35	0	0		115	465.5254	115	465.5254
+36	0	0		115	465.5254	115	465.5254
+37	0	0		115	465.5254	115	465.5254
+38	0	0		85	342.5133	85	342.5133
+39	0	0		85	342.5133	85	342.5133
+40	0	0		115	465.5254	85	342.5133
+41	0	0		115	465.5254	85	342.5133
+42	0	0		115	465.5254	85	342.5133
+43	0	0		115	465.5254	85	342.5133
+44	0	0		115	465.5254	85	342.5133
+45	0	0		115	465.5254	85	342.5133
+46	0	0		115	465.5254	85	342.5133
+47	0	0		115	465.5254	85	342.5133
+48	0	0		85	342.5133	115	465.5254
+49	0	0		85	342.5133	115	465.5254
+50	0	0		85	342.5133	115	465.5254
+51	0	0		85	342.5133	115	465.5254
+52	0	0		85	342.5133	115	465.5254
+53	0	0		85	342.5133	115	465.5254
+54	0	0		85	342.5133	115	465.5254
+55	0	0		85	342.5133	115	465.5254
+56	0	0		115	465.5254	85	342.5133
+57	0	0		115	465.5254	85	342.5133
+58	0	0		115	465.5254	85	342.5133
+59	0	0		115	465.5254	85	342.5133
+60	0	0		115	465.5254	85	342.5133
+61	0	0		115	465.5254	85	342.5133
+62	0	0		115	465.5254	85	342.5133
+63	0	0		115	465.5254	85	342.5133
+64	0	0		115	465.5254	115	465.5254
+65	0	0		115	465.5254	115	465.5254
+66	0	0		115	465.5254	115	465.5254
+67	0	0		115	465.5254	115	465.5254
+68	0	0		115	465.5254	115	465.5254
+69	0	0		115	465.5254	115	465.5254
+70	0	0		115	465.5254	115	465.5254
+71	0	0		115	465.5254	115	465.5254
+72	0	0		115	465.5254	115	465.5254
+73	0	0		115	465.5254	115	465.5254
+74	0	0		115	465.5254	85	342.5133
+75	0	0		115	465.5254	85	342.5133
+76	0	0		115	465.5254	85	342.5133
+77	0	0		115	465.5254	85	342.5133
+78	0	0		115	465.5254	85	342.5133
+79	0	0		115	465.5254	85	342.5133
+80	0	0		85	342.5133	115	465.5254
+81	0	0		85	342.5133	115	465.5254
+82	0	0		85	342.5133	115	465.5254
+83	0	0		85	342.5133	115	465.5254
+84	0	0		85	342.5133	115	465.5254
+85	0	0		85	342.5133	115	465.5254
+86	0	0		85	342.5133	115	465.5254
+87	0	0		85	342.5133	115	465.5254
+88	0	0		115	465.5254	115	465.5254
+89	0	0		115	465.5254	115	465.5254
+90	0	0		115	465.5254	115	465.5254
+91	0	0		115	465.5254	115	465.5254
+92	0	0		115	465.5254	115	465.5254
+93	0	0		115	465.5254	115	465.5254
+94	0	0		115	465.5254	115	465.5254
+95	0	0		115	465.5254	115	465.5254
+96	0	0		115	465.5254	0	0
+97	0	0		115	465.5254	0	0
+98	0	0		115	465.5254	0	0
+99	0	0		115	465.5254	0	0
+100	0	0		115	465.5254	0	0
+101	0	0		115	465.5254	0	0
+102	0	0		115	465.5254	0	0
+103	0	0		115	465.5254	0	0
+104	0	0		85	342.5133	0	0
+105	0	0		85	342.5133	0	0
+106	0	0		115	465.5254	0	0
+107	0	0		115	465.5254	0	0
+108	0	0		115	465.5254	0	0
+109	0	0		115	465.5254	0	0
+110	0	0		115	465.5254	0	0
+111	0	0		115	465.5254	0	0
+112	0	0		85	342.5133	0	0
+113	0	0		85	342.5133	0	0
+114	0	0		85	342.5133	0	0
+115	0	0		85	342.5133	0	0
+116	0	0		85	342.5133	0	0
+117	0	0		85	342.5133	0	0
+118	0	0		115	465.5254	0	0
+119	0	0		115	465.5254	0	0
+120	0	0		115	465.5254	0	0
+121	0	0		115	465.5254	0	0
+122	0	0		85	342.5133	0	0
+123	0	0		85	342.5133	0	0
+124	0	0		85	342.5133	0	0
+125	0	0		85	342.5133	0	0
+126	0	0		85	342.5133	0	0
+127	0	0		85	342.5133	0	0
+128	0	0		115	465.5254	0	0
+129	0	0		115	465.5254	0	0
+130	0	0		85	342.5133	0	0
+131	0	0		85	342.5133	0	0
+132	0	0		115	465.5254	0	0
+133	0	0		115	465.5254	0	0
+134	0	0		115	465.5254	0	0
+135	0	0		115	465.5254	0	0
+136	0	0		85	342.5133	0	0
+137	0	0		85	342.5133	0	0
+138	0	0		85	342.5133	0	0
+139	0	0		85	342.5133	0	0
+140	0	0		115	465.5254	0	0
+141	0	0		115	465.5254	0	0
+142	0	0		85	342.5133	0	0
+143	0	0		85	342.5133	0	0
+144	0	0		115	465.5254	0	0
+145	0	0		115	465.5254	0	0
+146	0	0		115	465.5254	0	0
+147	0	0		115	465.5254	0	0
+148	0	0		115	465.5254	0	0
+149	0	0		115	465.5254	0	0
+150	0	0		115	465.5254	0	0
+151	0	0		115	465.5254	0	0
+152	0	0		85	342.5133	0	0
+153	0	0		85	342.5133	0	0
+154	0	0		115	465.5254	0	0
+155	0	0		115	465.5254	0	0
+156	0	0		85	342.5133	0	0
+157	0	0		85	342.5133	0	0
+158	0	0		85	342.5133	0	0
+159	0	0		85	342.5133	0	0
+160	0	0		85	342.5133	0	0
+161	0	0		85	342.5133	0	0
+162	0	0		115	465.5254	0	0
+163	0	0		115	465.5254	0	0
+164	0	0		115	465.5254	0	0
+165	0	0		115	465.5254	0	0
+166	0	0		85	342.5133	0	0
+167	0	0		85	342.5133	0	0
+168	0	0		115	465.5254	0	0
+169	0	0		115	465.5254	0	0
+170	0	0		115	465.5254	0	0
+171	0	0		115	465.5254	0	0
+172	0	0		115	465.5254	0	0
+173	0	0		115	465.5254	0	0
+174	0	0		115	465.5254	0	0
+175	0	0		115	465.5254	0	0
+176	0	0		85	342.5133	0	0
+177	0	0		85	342.5133	0	0
+178	0	0		115	465.5254	0	0
+179	0	0		115	465.5254	0	0
+180	0	0		85	342.5133	0	0
+181	0	0		85	342.5133	0	0
+182	0	0		85	342.5133	0	0
+183	0	0		85	342.5133	0	0
+184	0	0		85	342.5133	0	0
+185	0	0		85	342.5133	0	0
+186	0	0		115	465.5254	0	0
+187	0	0		115	465.5254	0	0
+188	0	0		85	342.5133	0	0
+189	0	0		85	342.5133	0	0
+190	0	0		115	465.5254	0	0
+191	0	0		115	465.5254	0	0