Merge "Fix -Wreorder-init-list" into main