避免创建session
增强对hints的防御
Merge remote-tracking branch 'upstream/master'