Merge branch 'hotfix-1.2.4' into stable