Co-Authored-By: Qstick <376117+Qstick@users.noreply.github.com>
(cherry picked from commit b05bd685bc1bbd04d4b25b83a9fdd4ab3c4651ee)