Diff edk2-202605 with a edk2-202608-r1

Thank you!