Merge branch 'chores/2.4.0-develop' into 'develop'