support for local channels
fix for FABRIC-6
FABRIC-6 fix
Merge branch '2.0.2' into FABRICTHREE-709