Merge branch 't/const'