Fix Local model
Merge branch 'refs/heads/local' into dev