BS-7723
Improve logs