(cherry picked from commit aee8579d1823b7dfb94c0055fe33b5fb5a7fbf17) Towards #2733
Co-authored-by: Qstick <qstick@gmail.com>