Various changes to copy
Merge branch 'devel'