fix timestamp parsed from external dataset
merge upstream/master