Switch to using os:timestamp in the cs driver
Merge branch 'refactor/use-os-timestamp-for-cs-driver'