Fix regex_chans for multiple connections
Merge remote-tracking branch 'upstream/develop' into develop