851559f4e3 PR: Packager files clean up (#22382)
c597401da6 PR: Fix copyright in some modules (#22377)