AI-693 : do not miss exceptions, log them
Merge remote-tracking branch 'origin/production2' into production2