Merge pull request #8532 from neheb/j