Merge pull request #4518 from hvr/pr/timestamp2