Thanks guys. I will create a new patch based on edk2-basetools next week.