Merge branch 'cc/codespeed'