Add more choices more inactivity timer
Merge branch 'master' into Dev-Test