Merge branch 'release/2.5'
fix consts
Merge branch 'hotfix/2.5.1' into develop