Enforce timestamps and ensure they are unique
Bumped version to 1.2.1-beta
Merge branch 'release/1.2.1-beta' into develop