Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 7b9d7257b27c15547ffab8d73d10d8a850af364a)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 3776e97f9d366db8a720e2412ece6a1059999858)