Co-authored-by: Shauren <[email protected]> (cherry picked from commit 4e91f453aa345f8c9046108cdc0bae49e8662b11)