Co-authored-by: Aokromes <[email protected]> (cherry picked from commit 822b32b64bbea2640f68edd9d110f8379c4a3c42)