pull in recent changes

Line is too long. [89/80]