fix application resource
Merge branch 'master' into modular