Timestamp logic was updated.
Merge branch 'staging'

* staging:
  Timestamp logic was updated.