(cherry picked from commit 1deea5e5).
(cherry picked from commit bd9c2ce7acaef45f23c2659b854fc9925096d040)
Co-authored-by: Juliette Monsel <j4321@users.noreply.github.com>