Further improvements to ObjectID handling
2.12.2