GDS-1349
Improved logging