Comment out model import by default
Merge branch 'develop'