Changes from dev branch.
Changes from master