HH-45000 improve logging