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