Merge "TIAF: handle createSession and internal states"