CTL-168 Added support of buffering exception in Exception Handling
Merge remote-tracking branch 'origin/develop' into develop