Merge "Updated from 'timeStamp' to 'timestamp'"