(cherry picked from commit 7a768b5d0faf9aa57e78aee19cefee8fb19a42d5)
Co-Authored-By: ta264 <ta264@users.noreply.github.com>