Merge pull request #7299 from illume/upstream-0065-manifest-legal-documents