Merge branch 'cc/test-oidmap'