Merged to the dev branch.