diff --git a/source/internal-statistics-sql/CHANGELOG.md b/source/internal-statistics-sql/CHANGELOG.md
index c49c6bd..2a23f44 100644
--- a/source/internal-statistics-sql/CHANGELOG.md
+++ b/source/internal-statistics-sql/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
+* Add Heap Histogram (Bytes + Instances) statistics
+
### Changed
* Refactor content pack directory structure
diff --git a/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Bytes.StatisticStore.data.xml b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Bytes.StatisticStore.data.xml
new file mode 100644
index 0000000..6628e5e
--- /dev/null
+++ b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Bytes.StatisticStore.data.xml
@@ -0,0 +1,9 @@
+
+
+
+ Class Name
+
+
+ Node
+
+
diff --git a/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Bytes.StatisticStore.xml b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Bytes.StatisticStore.xml
new file mode 100644
index 0000000..3b9f795
--- /dev/null
+++ b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Bytes.StatisticStore.xml
@@ -0,0 +1,10 @@
+
+
+ The total bytes used in the java heap from a jmap heap histogram, qualified by node and java class name. Change the property stroom.node.status.heapHistogram.classNameMatchRegex to control which classes are included.
+ true
+ Heap Histogram Bytes
+ 60000
+ ALL
+ VALUE
+ 934a1600-b456-49bf-9aea-f1e84025febd
+
diff --git a/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Instances.StatisticStore.data.xml b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Instances.StatisticStore.data.xml
new file mode 100644
index 0000000..6628e5e
--- /dev/null
+++ b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Instances.StatisticStore.data.xml
@@ -0,0 +1,9 @@
+
+
+
+ Class Name
+
+
+ Node
+
+
diff --git a/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Instances.StatisticStore.xml b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Instances.StatisticStore.xml
new file mode 100644
index 0000000..5e09dab
--- /dev/null
+++ b/source/internal-statistics-sql/stroomContent/Internal Statistics/SQL/Heap Histogram Instances.StatisticStore.xml
@@ -0,0 +1,10 @@
+
+
+ The instance count from a jmap heap histogram, qualified by node and java class name. Change the property stroom.node.status.heapHistogram.classNameMatchRegex to control which classes are included.
+ true
+ Heap Histogram Instances
+ 60000
+ ALL
+ VALUE
+ e4f243b8-2c70-4d6e-9d5a-16466bf8764f
+
diff --git a/source/internal-statistics-stroom-stats/CHANGELOG.md b/source/internal-statistics-stroom-stats/CHANGELOG.md
index c3fca19..68e7e47 100644
--- a/source/internal-statistics-stroom-stats/CHANGELOG.md
+++ b/source/internal-statistics-stroom-stats/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
+* Add Heap Histogram (Bytes + Instances) statistics
+
### Changed
* Refactor content pack directory structure
diff --git a/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Bytes.StatisticStore.data.xml b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Bytes.StatisticStore.data.xml
new file mode 100644
index 0000000..04427bc
--- /dev/null
+++ b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Bytes.StatisticStore.data.xml
@@ -0,0 +1,9 @@
+
+
+
+ Class Name
+
+
+ Node
+
+
diff --git a/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Bytes.StatisticStore.xml b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Bytes.StatisticStore.xml
new file mode 100644
index 0000000..8d981b0
--- /dev/null
+++ b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Bytes.StatisticStore.xml
@@ -0,0 +1,10 @@
+
+
+ The total bytes used in the java heap from a jmap heap histogram, qualified by node and java class name. Change the property stroom.node.status.heapHistogram.classNameMatchRegex to control which classes are included.
+ true
+ Heap Histogram Bytes
+ 60000
+ ALL
+ VALUE
+ b0110ab4-ac25-4b73-b4f6-96f2b50b456a
+
diff --git a/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Instances.StatisticStore.data.xml b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Instances.StatisticStore.data.xml
new file mode 100644
index 0000000..04427bc
--- /dev/null
+++ b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Instances.StatisticStore.data.xml
@@ -0,0 +1,9 @@
+
+
+
+ Class Name
+
+
+ Node
+
+
diff --git a/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Instances.StatisticStore.xml b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Instances.StatisticStore.xml
new file mode 100644
index 0000000..f18c465
--- /dev/null
+++ b/source/internal-statistics-stroom-stats/stroomContent/Internal Statistics/Stroom-Stats/Heap Histogram Instances.StatisticStore.xml
@@ -0,0 +1,10 @@
+
+
+ The instance count from a jmap heap histogram, qualified by node and java class name. Change the property stroom.node.status.heapHistogram.classNameMatchRegex to control which classes are included.
+ true
+ Heap Histogram Instances
+ 60000
+ ALL
+ VALUE
+ bdd933a4-4309-47fd-98f6-1bc2eb555f20
+