Merge remote-tracking branch 'origin/develop'
session fixed
Finish session_fix