Merge "Keep the same row order during upgrade"