Refer to #16020 for details. This PR has been opened since we could not modify the previous PR since it's a contribution by an external contributor. Co-authored-by: kylegalbraith <kyle.galbraith459@gmail.com>