Merge tag '3.4' into latest