Merge branch '162-163-fix-timestamp-issues' into 'master'