(cherry picked from commit 6d552f2a60f44052079b5e8944f5e1bbabac56e0) Closes #3361
Co-authored-by: Qstick <qstick@gmail.com>