Final merge

Resolved :
- Metrics issues
- Suppressed warnings

Aurélien