Merge "Allow kwargs in create_timestamp"