Merge "Revert "[res] Optimize idmap data initialization in OMS"" into main