[BUG #60314] Re-integrate 'no expiration' field