Dropped yardsticks table
Merge branch 'dev'