More debugging info
(cherry picked from commit 9bcc2f8f2505188b46a8467a496875d57b4cdff0)