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