Merge remote branch 'kc/new/merge_help' into kcmaster