Co-authored-by: Qstick <qstick@gmail.com>
(cherry picked from commit 5061dc4b5e5ea9925740496a5939a1762788b793) Closes #9914