I think the more recent additions to this bug might be separate and are a duplicate of #31578, my bad
I think the more recent additions to this bug might be separate and are a duplicate of #31578, my bad