Merge "af-main: Refactor of user session management"