update changes
Merge branch 'master' into session-future