all applications minor fix
Merge pull request #451 from akhileshdarjee/4.0-hotfix

all applications minor fix