OC-2746: Changes from improvements in library