diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87053f7c95469e47a719fc85511fc1dc526df3cb..068668690825d7c4ec9d44cc4a26a9c85443ffea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ variables:
 
 run_api_test:
     stage: api_test
-    image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis
+    image: ${COMMON_IMAGE}
     allow_failure: false
     script:
         - "./gitlab-ci/install-dependencies.sh"
@@ -33,7 +33,7 @@ run_api_test:
 
 run_unit_test:
     stage: unit_test
-    image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis
+    image: ${COMMON_IMAGE}
     allow_failure: false
     script:
         - "./gitlab-ci/install-dependencies.sh"
@@ -47,7 +47,7 @@ run_unit_test:
 
 run_functional_test:
     stage: functional_test
-    image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis
+    image: ${COMMON_IMAGE}
     allow_failure: false
     script:
         - "./gitlab-ci/install-dependencies.sh"
diff --git a/bbf_plugin/atm.c b/bbf_plugin/atm.c
index 26ba4fa4565d7621ee5ce5dfef33a41875b46266..56d4bf4344e5b0c4ec261ab9d9f3a85a5a1016f4 100644
--- a/bbf_plugin/atm.c
+++ b/bbf_plugin/atm.c
@@ -351,6 +351,12 @@ static int set_atm_alias(char *refparam, struct dmctx *ctx, void *data, char *in
 	return bbf_set_alias(ctx, ((struct dm_data *)data)->config_section, "atmlinkalias", instance, value);
 }
 
+static int get_atm_LinkNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	int cnt = get_number_of_entries(ctx, data, instance, browseAtmLinkInst);
+	dmasprintf(value, "%d", cnt);
+	return 0;
+}
 /**********************************************************************************************************************************
 *                                            OBJ & LEAF DEFINITION
 ***********************************************************************************************************************************/
@@ -363,6 +369,7 @@ DMLEAF tATMLinkParams[] = {
 {"Status", &DMREAD, DMT_STRING, get_atm_status, NULL, BBFDM_BOTH},
 {"LowerLayers", &DMWRITE, DMT_STRING, get_atm_lower_layer, set_atm_lower_layer, BBFDM_BOTH, DM_FLAG_REFERENCE},
 {"LinkType", &DMWRITE, DMT_STRING, get_atm_link_type, set_atm_link_type, BBFDM_BOTH},
+{"LinkNumberOfEntries", &DMREAD, DMT_UNINT, get_atm_LinkNumberOfEntries, NULL, BBFDM_BOTH},
 {"DestinationAddress", &DMWRITE, DMT_STRING, get_atm_destination_address, set_atm_destination_address, BBFDM_BOTH},
 {"Encapsulation", &DMWRITE, DMT_STRING, get_atm_encapsulation, set_atm_encapsulation, BBFDM_BOTH},
 {0}
diff --git a/bbf_plugin/ptm.c b/bbf_plugin/ptm.c
index 3e995351e02777e2ba7adad670328ca1852a7653..f71c768762afafed869f28cb5012850f1a2bfa4e 100644
--- a/bbf_plugin/ptm.c
+++ b/bbf_plugin/ptm.c
@@ -241,6 +241,12 @@ static int get_ptm_stats_pack_sent(char *refparam, struct dmctx *ctx, void *data
 	return ubus_ptm_stats(value, "tx_packets", data);
 }
 
+static int get_ptm_LinkNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	int cnt = get_number_of_entries(ctx, data, instance, browsePtmLinkInst);
+	dmasprintf(value, "%d", cnt);
+	return 0;
+}
 /**********************************************************************************************************************************
 *                                            OBJ & LEAF DEFINITION
 ***********************************************************************************************************************************/
@@ -262,6 +268,7 @@ DMLEAF tPTMLinkParams[] = {
 {"Alias", &DMWRITE, DMT_STRING, get_ptm_alias, set_ptm_alias, BBFDM_BOTH, DM_FLAG_UNIQUE},
 {"Name", &DMREAD, DMT_STRING, get_ptm_link_name, NULL, BBFDM_BOTH, DM_FLAG_UNIQUE|DM_FLAG_LINKER},
 {"LowerLayers", &DMWRITE, DMT_STRING, get_ptm_lower_layer, set_ptm_lower_layer, BBFDM_BOTH, DM_FLAG_REFERENCE},
+{"LinkNumberOfEntries", &DMREAD, DMT_UNINT, get_ptm_LinkNumberOfEntries, NULL, BBFDM_BOTH},
 {0}
 };