avoid error if $app not exists
Merge branch 'refs/heads/develop'