Merge "More informative debugging messages"