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