HCOLL-167 moved classes to hash as they are used for set as well.
Merge remote-tracking branch 'origin/master'