Merge branch 'master' into session_lock