Lagrange [dev]

Merge branch 'dev' into release

6d04a0590b2e2815b42b6cf253a8e893aecc5126