Merge "[res] Better modification time resolution in Idmap" into main