issue #23108: bugfix oid code and bugfix test