Merge "Fix unexpected truncation again." into nyc-dev