Manually merge changes from v2021-updates into v2021
Manual MR to fold v2021-updates into v2021.
Signed-off-by: Walter Lozano walter.lozano@collabora.com
Manual MR to fold v2021-updates into v2021.
Signed-off-by: Walter Lozano walter.lozano@collabora.com