Merge "Set extra on connection." into nyc-mr1-dev