Merge branch 'hotfix/2.4.5'
Contestant category is 2 this year
Merge branch 'hotfix/2.4.6' into develop