issue #23976 and issue #23937
Merge pull request #1611 from gilmoskowitz/issue23976

issue #23976 and issue #23937