Co-Authored-By: Richard <1252123+kharenis@users.noreply.github.com> (cherry picked from commit c57ceac4debf7419be84096f997ba7b75c906586)