Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 13dd6016d749c07bfe2f20206a0bb8929ee585e8)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 8a51f3857c22cfa5feab8e72abcdab8802e711df)