Improve loading time.
Merge branch 'dev'