Hi Liming,

I have created Bugzilla: 3150 (https://bugzilla.tianocore.org/show_bug.cgi?id=3150)
and would be submitting a v3 series with the fix you have suggested.

Regards,

Sami Mujawar