Co-authored-by: Qstick <376117+Qstick@users.noreply.github.com> (cherry picked from commit 8f482c534f15c14a9b3097313a4f5e9273549d88) Closes #3627