Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit e49dd21bcbabdb330620d48f5915828cfd5eb983)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit 7bcd827806b0816d61122ba3d37dd40178d96d98)