Merge "Mark static methods"