Merge branch 'hotfix/hotfix'
Totals fix for joins
Merge branch 'hotfix/hotfix' into develop