Landed from contributor PR #28608 by @KimGLee. Co-authored-by: Kim <150593189+KimGLee@users.noreply.github.com>