ISIS-2569: prepare unification of Bookmark and Oid
17 files changed