hotfix test
Merge branch 'hotfix/SplashScreen'
Merge branch 'develop'