Merge "Avoid timestamp update when data is kept on dump" into rvc-dev