Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 2766ed0d45b2c3397de5cbdfa9cf7e03a0fdfb5d)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 3d48433078cb9501c506d2a15834e8dda1a3caef)