Fix to the previous patch
Merge branch 'hotfix-2.3.4' into develop