add const
Merge branch 'develop'