Doing this again due to bad timing with PR/backport etc.
(cherry picked from commit e1841bfc88) Co-authored-by: madomado <madonuko@outlook.com>
e1841bfc88