Merge branch 'master' into type_list