Merge "debug: Use __CLASS__ to get the name of the class"