Merge pull request #2484 from nabinhait/fix1

Leave application fix