Addressing comments for PR 2176.

BLD-529.