Merge "LiveSession refactor"