Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 79be754f9a74a43b5748dc0934241e7701cb9581)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit f34bddc325c414cb8ee21666bd307512577efdef)