(WIP) for #34612