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