Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit a1c421c638fd9ff2810b2a59f1ccd0a3a03657b1)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 8bd719e3faee8cb0054f51cf1fe9d372a9eea0ea)