[3.9][WIP] Fix latest merge