BI-269
Try to use graceful sessions