Merge "[res] Optimize idmap format for lookups" into main