Further work on the previous patch
Merge branch 'hotfix-2.2.35' into develop