Fixed wrong order of copying files.
Merge branch 'test' into dev