[Merge]merge last three commits.