Timestamp test fix
Merge branch 'development'