Co-authored-by: Qstick <qstick@gmail.com> (cherry picked from commit 4ca5a213fa0fc29ed93e7e31b080728d6fa7f1f3)