issue #23241: add types