Merge "Some enhancements on BCE."