issue #23241: added todo