Merge branch 'session_tickets' into development