Merge "Fix native methods"