Changed the Application Context.
Merge branch 'robin_Devbranch' into jerin_Devbranch