Merge "Fixed bug in BCE, with regression test."