Add changes from dev branch.