Merge pull request #281 from qiangdavidliu/2.x

Bridge channel fix to reduce statefullness of currentSnapshot