Séparation entre client, server et common
Merge remote-tracking branch 'origin/secondary' into secondary