Merge "add a method for non session" into tm-dev