(cherry picked from commit c0b17d9345367ab6500b7cca6bb70c1e3b930284)
Co-authored-by: Qstick <qstick@gmail.com> (cherry picked from commit 13aaa20f1bf1448fa804738804205cb16f0d91f9) Closes #1485