Auto-cherry-pick to 1.0.x Signed-off-by: SexyProgrammer <49146257+SexyProgrammer@users.noreply.github.com>