Merge branch 'hotfix-2.3.20' into develop
Fix to the missing accept terms button
Merge branch 'hotfix-2.3.21'