merge kbs_11574