Merge branch 'hotfix/deployment-fix'
This repo is not PosterPlayer but MoviePlayer.
Merge branch 'hotfix/deployment-fix-2' into develop