Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 9b66351f5b274f3d79cb2c48afa3b2fcc2bf3442)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 373d88a7117150de984510453e1c30a455987686)