Changed move to copy.
Merge branch 'develop'