Timesync impl
Merge