Ticket0185: Update some sessions design
Merge branch 'Ticket0185'