fixes #12434
Merge pull request #12798 from cyberb/stable7

fixes #12434 (stable7)