TH-12 | Check session of users
Merge TH-12 to dev1.0