Backport systemd-manage fixes from feature/iuvia-control into current release