Merge "avoid data overflow in low memory device"