A bit of cleaning - always useful
Merge branch 'dev-local'