Sessions support key removal
Merge branch 'session_key_removal'