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