Merge branch 'make_methods_const'