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