Pulled correction from 'main' branch

Added code to propagate timestamp version