ISIS-2569: polishing Oid
18 files changed