ISIS-2569: prepare unification of Bookmark and Oid (2)
34 files changed