Merge "Limit the number of blocks in command zero" into nyc-mr1-dev