Changes to add to development branch.
merge conflict sorted