[Fixes #51401727, #52207531, #51404581]