Merge pull request #1341 from jkczyz/2022-03-expiry-time-panic