Merge "Set/unset session on the callback" into lmp-dev