Updated for PR 4106, BLD-1134