Fixes #53977255, #54797156, #51838983