Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 686eab66420eec742338c1b75e499367e103e82b)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 3c8c851fe46b1924d84b04c49c60885452c4fbe2)