Improve log
(cherry picked from commit a597ce468a229f914e49f2412a915f3087623711)