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