Merge pull request #6827 from illume/app-external-plugin-manifest