Backport

https://github.com/oe-alliance/oe-alliance-enigma2/commit/96af1fc91987a7edabfeb862694d78e86a29af75