[UP-4344] Copy updates based on code review comments.