preloader improvements
Merge branch 'feature/preloader_improvements' into develop