CLC-4381 - Speed up development mode

https://jira.ets.berkeley.edu/jira/browse/CLC-4381
Merge pull request #3085 from christianv/CLC-4381

CLC-4381 - Speed up development mode