Add back the MetadataStatistics class using JPA.
Merge remote-tracking branch 'origin/develop' into develop