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