Merge "BUG-633: allow overriding of channelFactory"