Merge branch 'detail_type_list'