nit: apply const qualifier to some functions
nit: apply const qualifier to some functions
another round of const qualifiers...
Merge branch 'v7-devel'