Implements https://bugzilla.tianocore.org/show_bug.cgi?id=2048.

Best regards,

Vitaly Cheptsov