Merged results from dev branch.