Merge "Remove captured link expiration" into main