Merge branch 'hotfix/MC-420'
Merge pull request #1 from FareedhJailabdeen/develop

Develop
file deleted
Merge branch 'hotfix/HM-123' into develop