Improve debugging output for #1012 #1047

Closed nikmagini closed 7 years ago