Merge branch 'hotfix/2.4.1' into develop