Merge "Add support for checking method and field invariants for redefinition."