Merge remote-tracking branch 'pawel/patch-18' into v4.1
IM-573 - ignore exceptions covered by @