more loading time optimizations
Merge branch 'master' into beta