Merge "Fetch package context only once per package" into main