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