Homogenization of the access to Hazelcast collection
Merge branch 'master' into HEAD