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