Refactor session_handler

Lukas Müller requested to merge refactor/session_handler into release/2.0 Aug 31, 2022