Updated for PR 4106, BLD-1134

@stroilova @rocha please let me know.
@mhoeber , @srpearce FYI