Vectorisation
Merge remote branch 'origin/feature/vectorisation' into feature/vectorisation