TRUNK-3944: Responded to review comments
(cherry picked from commit 56c743b869668cef595160db7b6247c9d2c4bde8)