HCOLL-167 added isException flag
Merge remote-tracking branch 'origin/master'