Merge branch 'bw/trace-no-inline-getnanotime'