Merge commit 'v2.5.1'