Merge pull request #7248 from illume/upstream-backend-app-name-0031