[UP-4235]  Fix based on code review comments.