Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 4ec2325dd07a768f2b52ea788ee76085586b2469)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 85c8f88a49aa7c8aa866faed90a4a63330c15b8b)