HCOLL-230 - minor improvements
Merge remote-tracking branch 'origin/master'