LM: Fix model width and height to allow access to controls
Merge branch 'refs/heads/master' into local-dev