(#18342) WIP