GDS-1249
Improve logging