Why just merge like that and others changes in k3.1+ ?