HCOLL-77 some bug fixes but still has bugs
Merge remote-tracking branch 'origin/master'