Merge "Prepare for keeping concrete overrides of abstract methods" into main