Merge "Allow redefined methods/classes to access fields"