Re: #1580 - added expiry date