Merge "Fixed crash during saving certificate."