Merge branch 'hotfix-2.3.24'
Merge branch 'hotfix-2.3.25'
Merge branch 'hotfix-2.3.25'
Merge branch 'hotfix-2.3.25'
Merge branch 'hotfix-2.3.25'
Merge branch 'hotfix-2.3.25'
Merge branch 'hotfix-2.3.27'
Fix to the CSRF protection blocking a proposal add
Merge branch 'hotfix-2.3.28' into develop