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