Merge "Revert^2 "PackageParser support for flagging manifest entries"" into main