merge into master: support for multiple DAQs, other enhancements