Merge "Fixing package override is applied in all lookup options" into main