HCOLL-71 removed || in.position() == start as it not required
Merge remote-tracking branch 'origin/master'
HCOLL-71 removed || in.position() == start as it not required