[Fixes #49254451 and #49375489]