Build scripts that came with merge from upstream.
Remove padding rules from 3.1