Merge branch 'bugfix_names' into upstream-4.0-stable
Clean code + fix error handling in copy
Merge branch 'bugfix_fmscopy' into upstream-master