This PR contains changes introduced by @vcunat in https://gitlab.labs.nic.cz/vcunat/turris-os-packages/commit/3f8840dc
