DF-5048 increase save speed
merge