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