Close session

Shuang, would you please take a look and merge if ok ?