Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 5c9273152c59777771fa6c7b546316caf3f091d8)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 8fee1d348cc3d91a88319c0d72689acabaa2bf47)