Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 27fd12857b53ec22c0e918eee6c4c009643fccbc)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit d219361b4226944835959676d1721b2a9d29da72)