Merge "idmap2: use 'override' where possible"