Merge "Ensure that proxy operations look for attribution tag in proxy's pkg" into sc-dev