Merge "Assign missing stateful fields in PackageInfoUtils" into rvc-dev