pull in recent changes

Line is too long. [93/80]