Merge branch 'hotfix/1.11.10'
Magic numbers
Merge branch 'hotfix/1.11.11' into develop