Merge branch 'bw/oidmap-autoinit' into maint