Merge branch 'config/benchmark' into 'develop'