Merge with 076f7adff.