Copy just once the files.
Merge commit 'fe66372f6736c52ee42111fc8a627e6072273eaa' into development/architecture