Merge "Remove usages of package-scanning bugfix flags." into main