07071116 Merge To Sinri's

07071116 Merge To Sinri's