Merge "[res] Optimize Idmap actor matching" into main