Merge "Add FeatureGroup to PackageInfo" into lmp-dev