r19336: Merge from release branch: new Mapped OIDs, in own subtree.