Merge "Add new methods to activate/deactivate session" into tm-dev