Merge pull request #2165 from wpaulino/fix-bp-channel-pending-panic-flake