Resolve "Make timestamp generation customisable"

Merged Theodore Chang requested to merge 1463-make-timestamp-generation-customisable into develop

Merge request reports