Revert "Trimmed the branch to only the timestamp_tools sub directory"

This reverts commit bc1599279d3eb166bfd9e580ac5991d5508914e1.
Rebase from 'upstream' @ version '1.6.5'
Trimmed the branch to only the timestamp_tools sub directory