Merge "Stop using the "stretching" file"