closes #4790 (cherry picked from commit 7dcc17e4a2) Co-authored-by: madomado <madonuko@outlook.com>
7dcc17e4a2