Draft: CKI friendly 6.4 mm plus followups
DO NOT MERGE! CKI reviewers note: this MR is removing module licenses and will cause modules to appear to be removed when they are in fact not.
Depends: !4002 (merged) Depends: !4047
Edited by Chris von Recklinghausen