Merging 7971:887db7d64bc9 with 7970:21b063622472.