Merge "Fix bug in BCE remainder handling."