Rebase master and fix one issue.