Bugfix- was joining on Metric like any other source table
Merge branch 'release/2.1'