Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit d54dc24d6d6ad9ce4fbebd5f9a69a92633504c40)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 22eddd8b9d4d905237494c9841e65e4c073ab514)