Merge with master - add semantics session