Merged patch to dev branch.