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

* commit '05bfefb16539c50f9e20b2831857bc11f7d8e227':
  Fixed bug in BCE, with regression test.