Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 12434966ebed20cea322b8a6bd4671c7f42e3e49)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 367bafc7c153611b39bb41145a9601e5f1cb4934)