HCOLL-230 -corrected assert
Merge remote-tracking branch 'origin/master'