Merge "Allow packages to be enabled depending on sku value" into main