Small fix
Merge branch 'hotfix-2.3.35' into develop