Merge "Clarify method names and improve debug"