Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 33e57d0ace83e4f5deab0211474cd84607878024)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 09a1b2bdbab20635888b3b226bd1e9a8e31a75ec)