diff --git a/distro/changelog.xml b/distro/changelog.xml
index 5f8a4b6..eb6b036 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="common-smartgears-2.1.2" date="2017-03-22">
+		<Change>Modified the Authorization filter to accept also children 
+		scope when authorizeChildrenContext is enabled on ContianerConfiguration</Change>
+		<Change>Shutdown of Accounting thread added</Change>
+	</Changeset>
 	<Changeset component="common-smartgears-2.1.1" date="2017-01-25">
 		<Change>Minor issue on filter exclusion fixed</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index de43105..f2a116c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-smartgears</artifactId>
-	<version>2.1.1-SNAPSHOT</version>
+	<version>2.1.2-SNAPSHOT</version>
 	<name>SmartGears</name>
 
 	<properties>
diff --git a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
index cf33c86..e092246 100644
--- a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
+++ b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
@@ -27,6 +27,7 @@ public class AccountingManager extends ContainerHandler {
 	public void onStop(ContainerLifecycleEvent.Stop e) {
 		logger.trace("Going to flush accounting data");
 		AccountingPersistenceFactory.flushAll(1000, TimeUnit.MILLISECONDS);
+		AccountingPersistenceFactory.shutDown();
 	}
 	
 	@Override