Driver swap support, participant holds multiple drivers now
Merge branch 'develop'