Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  Keep old timestamps during data migration