-
Rémi Denis-Courmont authored
(cherry picked from commit e3c350269cf1b482d2f6842e5b31a83be27a1c40) (kept core part only to minimize changes)
588b5225
(cherry picked from commit e3c350269cf1b482d2f6842e5b31a83be27a1c40) (kept core part only to minimize changes)