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