Merge branch 'nd/trace-index-ops'