Merge pull request #2966 from marek-safar/oid