updates from osci-toolkit and osci-toolkit-frontend