Change method of time synchronization.
Merge branch 'master' into production