Merge "Restore padding." into nyc-mr1-dev