Merge "Session states refactor."