Magic numbers
Merge branch 'hotfix/1.11.11'