Merge commit 'v2.4' into HEAD