[Fixes #55012582]
[Fixes #55001542]