Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit ae12c5e990a06099340c9467ee1a02354420812d)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 6dc2658fd66c18239ad33cb1ffbdfc22b0d9e51e)