merge wenxinbnb updates