Fixed a broken model.
Merge branch 'develop' into feature/connorb/replace-model
Merge branch 'feature/connorb/replace-model' into bugfix/release_0.14.318