Experiment to improve sessions timeouts.

Refs #539 #344 #297