Merge "Avoid to reset the data" into main