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