channelfactory getChannel commented out
Merge remote-tracking branch 'origin/threading' into threading