Adds support for Discovery machines as well as advanced status and le… · Zealandia-Systems/Swordfish@bd290a6