2.7.4 patches split and fixed