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