Fix up merge of 8.38.