Fix to the previous commit
Merge branch 'hotfix-2.2.35'