fix session timeout in admin
Merge branch 'iprequestcleanup' into develop