subissue of #51969
subissue of #51969