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