Updated master file.
Merge branch 'hotfix/Hotfix' into develop