Issuue9: Change persistent timeout to seconds