Merge "Allow kwargs in get_timestamp"