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