Merge "Avoid scan result time overflow." into sc-dev