Merge "Fixed bug in BCE, with regression test."
am: 5ee830173b

* commit '5ee830173bd5d1de3e1e0581e405a910a3089e73':
  Fixed bug in BCE, with regression test.