Update to the latest

Before give pull request to upstream (openSUSE team),merge the latest to bjteam.