Merge "Use correct index when obtaining unresolved attribute value" into nyc-dev