Fixes #7301, merge ASAP