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

This reverts commit 0b79146a51dc72c4def0f445f841ea0d55589265.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the timestamp_tools sub directory