OZP-507 - changes from code review