CB-4469 updates from code review