Merge "Correct exception behavior for default methods"