HCOLL-268 simplified the Json Parsing
Merge remote-tracking branch 'origin/master'