Keeping validity in seconds
Merging postreleasefix/78 to release/78

* postreleasefix/78:
  Keeping validity in seconds