Merge branch 'nd/trace-with-env'