Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit f66496d291881f1eaca2ee5d326367fb73537541)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 4f5e85e9e97de4ae6e3d779ff42bf392c4739234)