References #1595: Fixed potential race conditions in internal data structures for model and manager classes.