fix consts
Merge branch 'hotfix/2.5.1'