Merge "Fix possible out of bounds accesses" into nyc-dev