Co-authored-by: Qstick <qstick@gmail.com> (cherry picked from commit 3d6cf24d7c91f8ff697c34264c249f7450894106) Closes #2726
Co-Authored-By: ta264 <ta264@users.noreply.github.com>