diff --git a/.gitreview b/.gitreview
index 8fdf902..b8f0e36 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.opencord.org
 port=29418
 project=bng.git
-defaultremote=origin
+defaultremote=master
diff --git a/LICENSE.txt b/LICENSE.txt
index 56c7414..544e760 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016-2023 Open Networking Foundation (ONF) and the ONF Contributors
+   Copyright 2016-2024 Open Networking Foundation (ONF) and the ONF Contributors
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/api/pom.xml b/api/pom.xml
index c6086ad..8bec593 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/BngAttachment.java b/api/src/main/java/org/opencord/bng/BngAttachment.java
index f895831..c73b477 100644
--- a/api/src/main/java/org/opencord/bng/BngAttachment.java
+++ b/api/src/main/java/org/opencord/bng/BngAttachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/BngService.java b/api/src/main/java/org/opencord/bng/BngService.java
index 8d9d3fd..0fb21d2 100644
--- a/api/src/main/java/org/opencord/bng/BngService.java
+++ b/api/src/main/java/org/opencord/bng/BngService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/BngStatsEvent.java b/api/src/main/java/org/opencord/bng/BngStatsEvent.java
index 267d62a..dfdd8f7 100644
--- a/api/src/main/java/org/opencord/bng/BngStatsEvent.java
+++ b/api/src/main/java/org/opencord/bng/BngStatsEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/BngStatsEventListener.java b/api/src/main/java/org/opencord/bng/BngStatsEventListener.java
index 3b8bce8..fee5f35 100644
--- a/api/src/main/java/org/opencord/bng/BngStatsEventListener.java
+++ b/api/src/main/java/org/opencord/bng/BngStatsEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/BngStatsEventSubject.java b/api/src/main/java/org/opencord/bng/BngStatsEventSubject.java
index faa5076..fa0a432 100644
--- a/api/src/main/java/org/opencord/bng/BngStatsEventSubject.java
+++ b/api/src/main/java/org/opencord/bng/BngStatsEventSubject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/BngStatsService.java b/api/src/main/java/org/opencord/bng/BngStatsService.java
index ccea031..ea1091f 100644
--- a/api/src/main/java/org/opencord/bng/BngStatsService.java
+++ b/api/src/main/java/org/opencord/bng/BngStatsService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/PppoeBngAttachment.java b/api/src/main/java/org/opencord/bng/PppoeBngAttachment.java
index 3720325..b09831d 100644
--- a/api/src/main/java/org/opencord/bng/PppoeBngAttachment.java
+++ b/api/src/main/java/org/opencord/bng/PppoeBngAttachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/PppoeBngControlHandler.java b/api/src/main/java/org/opencord/bng/PppoeBngControlHandler.java
index d3900b7..7bab9cb 100644
--- a/api/src/main/java/org/opencord/bng/PppoeBngControlHandler.java
+++ b/api/src/main/java/org/opencord/bng/PppoeBngControlHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/PppoeEvent.java b/api/src/main/java/org/opencord/bng/PppoeEvent.java
index 0bfe2f0..9549884 100644
--- a/api/src/main/java/org/opencord/bng/PppoeEvent.java
+++ b/api/src/main/java/org/opencord/bng/PppoeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/PppoeEventListener.java b/api/src/main/java/org/opencord/bng/PppoeEventListener.java
index 396780e..dc75618 100644
--- a/api/src/main/java/org/opencord/bng/PppoeEventListener.java
+++ b/api/src/main/java/org/opencord/bng/PppoeEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/PppoeEventSubject.java b/api/src/main/java/org/opencord/bng/PppoeEventSubject.java
index 6ad2bcc..f9b22b8 100644
--- a/api/src/main/java/org/opencord/bng/PppoeEventSubject.java
+++ b/api/src/main/java/org/opencord/bng/PppoeEventSubject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/org/opencord/bng/package-info.java b/api/src/main/java/org/opencord/bng/package-info.java
index 779576e..a186b0d 100644
--- a/api/src/main/java/org/opencord/bng/package-info.java
+++ b/api/src/main/java/org/opencord/bng/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/app.xml b/app/app.xml
index cd3f4d1..3df9c67 100644
--- a/app/app.xml
+++ b/app/app.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/features.xml b/app/features.xml
index 6c681bb..5602351 100644
--- a/app/features.xml
+++ b/app/features.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-  ~ Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/pom.xml b/app/pom.xml
index 1ffcddb..99ff6eb 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/AddAttachment.java b/app/src/main/java/org/opencord/bng/cli/AddAttachment.java
index e99682a..bf37d49 100644
--- a/app/src/main/java/org/opencord/bng/cli/AddAttachment.java
+++ b/app/src/main/java/org/opencord/bng/cli/AddAttachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/AttachmentKeyCompleter.java b/app/src/main/java/org/opencord/bng/cli/AttachmentKeyCompleter.java
index 5b3d338..47a9fad 100644
--- a/app/src/main/java/org/opencord/bng/cli/AttachmentKeyCompleter.java
+++ b/app/src/main/java/org/opencord/bng/cli/AttachmentKeyCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/AttachmentStats.java b/app/src/main/java/org/opencord/bng/cli/AttachmentStats.java
index 2d65309..5ab2c51 100644
--- a/app/src/main/java/org/opencord/bng/cli/AttachmentStats.java
+++ b/app/src/main/java/org/opencord/bng/cli/AttachmentStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/Attachments.java b/app/src/main/java/org/opencord/bng/cli/Attachments.java
index 0002b2e..10bec11 100644
--- a/app/src/main/java/org/opencord/bng/cli/Attachments.java
+++ b/app/src/main/java/org/opencord/bng/cli/Attachments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/BngCliUtils.java b/app/src/main/java/org/opencord/bng/cli/BngCliUtils.java
index 8441699..1c0fdbc 100644
--- a/app/src/main/java/org/opencord/bng/cli/BngCliUtils.java
+++ b/app/src/main/java/org/opencord/bng/cli/BngCliUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/ControlPacketsStats.java b/app/src/main/java/org/opencord/bng/cli/ControlPacketsStats.java
index 8580fc4..fd260a5 100644
--- a/app/src/main/java/org/opencord/bng/cli/ControlPacketsStats.java
+++ b/app/src/main/java/org/opencord/bng/cli/ControlPacketsStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/EnableAttachment.java b/app/src/main/java/org/opencord/bng/cli/EnableAttachment.java
index b5ff9dc..7c46939 100644
--- a/app/src/main/java/org/opencord/bng/cli/EnableAttachment.java
+++ b/app/src/main/java/org/opencord/bng/cli/EnableAttachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/OnuSerialCompleter.java b/app/src/main/java/org/opencord/bng/cli/OnuSerialCompleter.java
index 6183306..90fcbdc 100644
--- a/app/src/main/java/org/opencord/bng/cli/OnuSerialCompleter.java
+++ b/app/src/main/java/org/opencord/bng/cli/OnuSerialCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/RemoveAttachment.java b/app/src/main/java/org/opencord/bng/cli/RemoveAttachment.java
index a6f47ec..c50e42a 100644
--- a/app/src/main/java/org/opencord/bng/cli/RemoveAttachment.java
+++ b/app/src/main/java/org/opencord/bng/cli/RemoveAttachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/cli/package-info.java b/app/src/main/java/org/opencord/bng/cli/package-info.java
index e44a15a..2a8fbaf 100644
--- a/app/src/main/java/org/opencord/bng/cli/package-info.java
+++ b/app/src/main/java/org/opencord/bng/cli/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/config/BngConfig.java b/app/src/main/java/org/opencord/bng/config/BngConfig.java
index ad731bf..7f0ef35 100644
--- a/app/src/main/java/org/opencord/bng/config/BngConfig.java
+++ b/app/src/main/java/org/opencord/bng/config/BngConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/config/PppoeRelayConfig.java b/app/src/main/java/org/opencord/bng/config/PppoeRelayConfig.java
index c558862..5032800 100644
--- a/app/src/main/java/org/opencord/bng/config/PppoeRelayConfig.java
+++ b/app/src/main/java/org/opencord/bng/config/PppoeRelayConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/config/package-info.java b/app/src/main/java/org/opencord/bng/config/package-info.java
index 8589b18..984ab1c 100644
--- a/app/src/main/java/org/opencord/bng/config/package-info.java
+++ b/app/src/main/java/org/opencord/bng/config/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/BngManager.java b/app/src/main/java/org/opencord/bng/impl/BngManager.java
index 2593909..0582e84 100644
--- a/app/src/main/java/org/opencord/bng/impl/BngManager.java
+++ b/app/src/main/java/org/opencord/bng/impl/BngManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/BngStatsManager.java b/app/src/main/java/org/opencord/bng/impl/BngStatsManager.java
index c2f5da5..212c03a 100644
--- a/app/src/main/java/org/opencord/bng/impl/BngStatsManager.java
+++ b/app/src/main/java/org/opencord/bng/impl/BngStatsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/BngUtils.java b/app/src/main/java/org/opencord/bng/impl/BngUtils.java
index 5c52a84..1a91cde 100644
--- a/app/src/main/java/org/opencord/bng/impl/BngUtils.java
+++ b/app/src/main/java/org/opencord/bng/impl/BngUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/OsgiPropertyConstants.java b/app/src/main/java/org/opencord/bng/impl/OsgiPropertyConstants.java
index 70e4e7b..8eb3184 100644
--- a/app/src/main/java/org/opencord/bng/impl/OsgiPropertyConstants.java
+++ b/app/src/main/java/org/opencord/bng/impl/OsgiPropertyConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java b/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java
index d0f6d6c..45bb9f1 100644
--- a/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java
+++ b/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/SimpleAttachmentEventHandler.java b/app/src/main/java/org/opencord/bng/impl/SimpleAttachmentEventHandler.java
index fc67350..49fc42d 100644
--- a/app/src/main/java/org/opencord/bng/impl/SimpleAttachmentEventHandler.java
+++ b/app/src/main/java/org/opencord/bng/impl/SimpleAttachmentEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/impl/package-info.java b/app/src/main/java/org/opencord/bng/impl/package-info.java
index 4dabe1d..6ee1dbb 100644
--- a/app/src/main/java/org/opencord/bng/impl/package-info.java
+++ b/app/src/main/java/org/opencord/bng/impl/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/GenericPpp.java b/app/src/main/java/org/opencord/bng/packets/GenericPpp.java
index af66eb3..500bdd2 100644
--- a/app/src/main/java/org/opencord/bng/packets/GenericPpp.java
+++ b/app/src/main/java/org/opencord/bng/packets/GenericPpp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/Ipcp.java b/app/src/main/java/org/opencord/bng/packets/Ipcp.java
index 18aad5b..9ebf7ff 100644
--- a/app/src/main/java/org/opencord/bng/packets/Ipcp.java
+++ b/app/src/main/java/org/opencord/bng/packets/Ipcp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/Ppp.java b/app/src/main/java/org/opencord/bng/packets/Ppp.java
index 5ee881b..57a8e80 100644
--- a/app/src/main/java/org/opencord/bng/packets/Ppp.java
+++ b/app/src/main/java/org/opencord/bng/packets/Ppp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/PppProtocolType.java b/app/src/main/java/org/opencord/bng/packets/PppProtocolType.java
index cab1c4f..0bd98f1 100644
--- a/app/src/main/java/org/opencord/bng/packets/PppProtocolType.java
+++ b/app/src/main/java/org/opencord/bng/packets/PppProtocolType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/PppTlv.java b/app/src/main/java/org/opencord/bng/packets/PppTlv.java
index 084de73..e1d8695 100644
--- a/app/src/main/java/org/opencord/bng/packets/PppTlv.java
+++ b/app/src/main/java/org/opencord/bng/packets/PppTlv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/Pppoe.java b/app/src/main/java/org/opencord/bng/packets/Pppoe.java
index d795bfe..86b46c9 100644
--- a/app/src/main/java/org/opencord/bng/packets/Pppoe.java
+++ b/app/src/main/java/org/opencord/bng/packets/Pppoe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/PppoeTlvTag.java b/app/src/main/java/org/opencord/bng/packets/PppoeTlvTag.java
index 8978f23..f8d47b5 100644
--- a/app/src/main/java/org/opencord/bng/packets/PppoeTlvTag.java
+++ b/app/src/main/java/org/opencord/bng/packets/PppoeTlvTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/org/opencord/bng/packets/package-info.java b/app/src/main/java/org/opencord/bng/packets/package-info.java
index 6a53cb1..52fb99d 100644
--- a/app/src/main/java/org/opencord/bng/packets/package-info.java
+++ b/app/src/main/java/org/opencord/bng/packets/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/test/java/org/opencord/bng/packets/GenericPppTest.java b/app/src/test/java/org/opencord/bng/packets/GenericPppTest.java
index 27d10c6..bc085c5 100644
--- a/app/src/test/java/org/opencord/bng/packets/GenericPppTest.java
+++ b/app/src/test/java/org/opencord/bng/packets/GenericPppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/test/java/org/opencord/bng/packets/IpcpTest.java b/app/src/test/java/org/opencord/bng/packets/IpcpTest.java
index c81c190..a4e74b9 100644
--- a/app/src/test/java/org/opencord/bng/packets/IpcpTest.java
+++ b/app/src/test/java/org/opencord/bng/packets/IpcpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/test/java/org/opencord/bng/packets/PppoeTest.java b/app/src/test/java/org/opencord/bng/packets/PppoeTest.java
index a6e5aba..8571570 100644
--- a/app/src/test/java/org/opencord/bng/packets/PppoeTest.java
+++ b/app/src/test/java/org/opencord/bng/packets/PppoeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+ * Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index 6ba0b76..46f7564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
 
     <properties>
         <sadis.api.version>5.12.2</sadis.api.version>
-        <olt.api.version>5.2.4</olt.api.version>
+        <olt.api.version>5.2.5</olt.api.version>
     </properties>
 
     <modules>
diff --git a/spotbugs-security-exclude.xml b/spotbugs-security-exclude.xml
index 2c83255..8c53c61 100644
--- a/spotbugs-security-exclude.xml
+++ b/spotbugs-security-exclude.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/spotbugs-security-include.xml b/spotbugs-security-include.xml
index e63b4f8..192c19e 100644
--- a/spotbugs-security-include.xml
+++ b/spotbugs-security-include.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
+  ~ Copyright 2020-2024 Open Networking Foundation (ONF) and the ONF Contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.