Update according to 975c23a thru b0c01c0