Removed history from the model as this is an expensive task and its fairly simple to store changes that you want to the model.
Merge branch 'develop'