* Updates based on review comments * bump netdisco and remove enigma2 init code * revert netdisco bump