App Layering - Windows and Office activation lost after upgrading to 2211

Provisioned machines with user layers lose their Windows activation status or Office will report not being activated, after upgrading to App Layering 2211...