Merge "Thread: use network time for generating dataset" into main