Merge changes from topic "stats-migration" into tm-dev

* changes:
  Add null check when list directory
  [MS82.2] Add a rewriteSingle method that takes two timestamps