(cherry picked from commit 1bc52d0138c7bcb94ffce31ec05f675387612a62) Co-authored-by: ta264 <ta264@users.noreply.github.com>