[Fixes #54405770]