Merge "Fix smallest width configuration calculation" into nyc-dev