[Fixes #70216206]
[Fixes #69026096]