Merge branch 'derkling-add-ns-clock-support'