Merge "PackageParser support for flagging manifest entries" into main