Merge "Add override keyword to in inherited classes"