Merge "Add missing "override" annotations" into main