//TODOs
Merge pull request #1541 from Danny-Hazelcast/todos

//TODOs