Merge commit 'origin/benchmark' into release