Issue #19436 Add session expire logic and overrides to support it.