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