(cherry picked from commit 7894fc2143) Co-authored-by: madomado <madonuko@outlook.com>
7894fc2143
closes #2765