manually merge pull request #744 (fixes #7444)