Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 60df95c6bd8c8cc0d440f3940bbbe936d490c67d)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 834d6c60db266c7d7dfd973729f20379dd3da287)