Merge "Prevent random crashes on SGX architecture Bug #6219894"