Merge pull request #21988 from eileenmcnaughton/isset2