issue #23976 and issue #23937