Tried to fix EDKT149. Since the issue happened randomly, only long time test can...