Merged into master from dev.