CONN-1462: Fixed the logging based on review comments