Adding ntp
testing global
Merge branch 'ntp' into production