Prepare release v2.4
Merge commit 'development'
Merge branch 'development'