Fix bug caused by circular model imports
Merge branch 'develop'