Merge pull request #4174 from WoltLab/new-app-management