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