Fix merge 27f26b0815