Merge "Also update setMinLines" into nyc-dev