Merge branch '3575_nanoseconds'