Improve the handling of the timestamp.
Merge branch 'dev'