Merge branch 'constify' into release