Merge branch 'dev-magre' into dev
Merge branch 'dev' into dev-magre