Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 69ef6e4a75255e60a4c4a2419d03c9352b9eb8f2)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 3b49ab6219790c341ffb78a6eeaaa8b1a4b29bcc)