hirachy finished(without compositeType)
STO add  & modified
Merge remote-tracking branch 'origin/zhu412' into start_from_412_afternoon
4/12 merged current work. for check0-4