[3.9] Fix latest merge