Fixes #63205. (cherry picked from commits 3fa943fe23, 42a16ef76e and 2ff69d6181)
3fa943fe23
42a16ef76e
2ff69d6181