CB-7904 incorporated feedback from comments on PR