ISIS-2569: prepare unification of Bookmark and Oid (3)
9 files changed