Testing ntp
Merge branch 'ntp' into production