2.7.1 changes resored