Merge "Verify redefined classes"