Accept patch from Darrell Loverin for FLEX-33321.  All tests pass